Namespace scope org for 'Web Server' OAuth2. Set db on token refresh save. Fix the favicon error.
issue #20891: Add web address to contact.
Merge branch 'master' into 20891
Merge pull request #627 from bendiy/20820

Namespace scope org for 'Web Server' OAuth2. Set db on token refresh sav...
Oops. Swat.
Merge pull request #634 from jrogelstad/20891

issue #20891: Add web address. Fix catastrophic error.