fix http://stackoverflow.com/questions/4826639/repack-of-git-repository-fails
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.
Bug 1064631 - Wrap UID-based ip addresses and netclasses calculations
Bug 1103367: Increasing timeout of the stop action in the MySQL cartridge
Add a section to inject information about external cartridges
Bug 1103849 - Remove quota for deleted gear by uid
Merge pull request #5473 from jwforres/external_carts_section

Merged by openshift-bot
Corrected cmd to enable correctly returning STDERR from nsupdate as STDOUT
Added fqdn to modify_dns method
Moved Rails.logger.error to before the raise
Merge pull request #5408 from tiwillia/master

Merged by openshift-bot
Merge pull request #5472 from jhadvig/timeout_bump

Merged by openshift-bot
Bug 1101499: Adjusting logic of gear state restoration
Bug 1086807 - Advertise $PATH for scaled SCL based cartridges
Bug 1103772 - Add svn client to support Redmine
Merge pull request #5453 from pivanov/css-small-fix

Merged by openshift-bot