Update to upstream release 1.0.0.RC2.
Add note on how to change the service settings.
Merge branch 'master' into pre-release
Update to upstream release 1.0.0.