CA-101777: some improvements on metadata backup/restore