Merge pull request #4496 from tomhughes/disabled-auth-error

Return an error when a disabled authentication mechanism is used

diff --cc app/controllers/api_controller.rb
Simple merge

diff --cc app/controllers/application_controller.rb
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc config/settings.yml
Simple merge