Bug 896364 - Minor cleanup.
Bug 901949 - setting Accept header on OAuth to workaround a bug in some versions of ActiveSupport
Merge pull request #1195 from rmillner/BZ896364

Merged by openshift-bot
Merge remote-tracking branch 'upstream/master'
Merge pull request #1197 from fabianofranz/master

Merged by openshift-bot