Merge branch 'sto495' of github.com:Metaswitch/sprout into sto495-gr
Merge branch 'dev' of github.com:Metaswitch/sprout into sto495-gr
Re-enable geo-redundancy with new memcached redundancy scheme
Merge branch 'sto495-gr' of github.com:Metaswitch/sprout into sto495-gr2
Code review updates
Merge pull request #267 from Metaswitch/sto495-gr2

[Reviewer Matt] Sprout changes to reenable geo-redundancy with new memcached redundancy