Merging 16820:16891 from trunk.

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

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

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

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

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

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