Revision 1883406

Merge the r1878855 group from trunk:

 * r1878855, r1878859
   Make the hot-backup.py script work with Python 3.
   Justification:
     Script should work with Python3
   Votes:
     +1: jamessan, brane