Change default options
Change name to upstream
Merge pull request #337 from Metaswitch/defaults

[Reviewer: Mike] Change default options