Merge remote-tracking branch 'origin/master' into mockdiameterstack
Merge pull request #44 from Metaswitch/mockdiameterstack

Change diameterstack to allow mocking it out
Add 403 code and change away from hash defines
Merge pull request #45 from Metaswitch/http_code

[No reviewer] Add 403 code and change away from hash defines
Add virtual keyword to ChronosConnection APIs for UT purposes
Fix indenting
Merge pull request #46 from Metaswitch/virtualize-chronos-connection

Reviewer Ellie - Add virtual keyword to ChronosConnection APIs for UT purposes
Remove 'superfluous' timeout code.
Merge pull request #47 from Metaswitch/rm_superfluous_timeout_code

Reviewer MIRW - Remove 'superfluous' timeout code.
Merge remote-tracking branch 'origin/master' into reg_data_ut