rename clashing integration test number
move legacy repo tar balls
move mock_services to common
Merge pull request #441 from reneme/fix-test_clashes

FIX: Minor Test Clashes and Issues