(DOC-891) some corrections to back up and restore from support