added Servlet 3 dependency

Importing this template application in Eclipse shows error as the snoop.jsp depends on the Servlet API. It will improve user first time experience.
nsupdate_plugin: Exception logging now includes error output from nsupdate command

Bug 1089697
Bugzilla link https://bugzilla.redhat.com/show_bug.cgi?id=1089697
When troubleshooting DNS record addition/removal errors, it is helpful to have the error output from the nsupdate command. Specifically in scenarios where record changes only fail <1% of the time.
Follow rc convention and use Rails.logger to avoid large amounts of text in the exception string
Include npm CLI scripts in the user's PATH - https://trello.com/c/eTwC7UbD/174-support-for-javascript-cli-build-tools-from-npm
Split duplicate code into seperate method
Pass dns action for logger as a string rather than a boolean
[stylesheets] - remove unit after 0 length.
Fix bug 1101779

RPM can't handle directories being replaced by symlinks and
thus %pretrans workaround is needed.

Credit: Troy Dawson
Merge pull request #5454 from VojtechVitek/fix_ruby_rpm

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-controller] release [1.25.3-1].
Automatic commit of package [openshift-origin-cartridge-ruby] release [1.25.3-1].
Bug 1102273: Make domain scopes additive
Ensure at least one scope's conditions are met, even when combined with complex queries
Bug 1101836: Apache shouldn't disable backend when it can't connect to it.
Bug 1101156 - Always initialize container_plugin
Merge pull request #5455 from liggitt/scope_complex_conditions

Merged by openshift-bot
Bug 1100518 - Correct throttler's CPU usage math
Move cgroup sample timestamp insertion and fix unit test
Merge pull request #5456 from mrunalp/bug/1101836

Merged by openshift-bot
Merge pull request #5457 from jwhonce/bug/1101156

Merged by openshift-bot