Conflicts:
	mgm/WFE.cc
	mgm/bulk-request/prepare/manager/PrepareManager.cc
	mgm/bulk-request/prepare/manager/PrepareManager.hh
	unit_tests/mgm/bulk-request/BulkRequestPrepareManagerTest.cc
	unit_tests/mgm/bulk-request/MockPrepareMgmFSInterface.hh
	unit_tests/mgm/bulk-request/PrepareManagerTest.cc