Randomize the numbers allocated by Ellis
Merge pull request #63 from Metaswitch/randomize_numbers

[Reviewer: Rob] Randomize the numbers allocated by Ellis
Change Metaswitch submodule refs to ClearwaterCore