Removing SitesPerHost from the default deployment file causes the Test to fail because SitesPerHost defaults to 8 instead of 2
Merge branch 'master' into Fix-Default-SitesPerHost-Test
Merge pull request #1340 from VoltDB/Fix-Default-SitesPerHost-Test

Fix default sites per host test