MDL-18177 backup: addressing coding standards