squash commits, clean up files so they can be reviewed as easily as possible
FE-3335 Add support for Mercurial scm