SSP-755 Committing various updates/fixedbugs/refactorings to data
migration tool