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
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
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
Merge pull request #5475 from jhadvig/restore_db

Merged by openshift-bot
Merge pull request #5256 from mfojtik/bugzilla/1086807

Merged by openshift-bot
Merge pull request #5476 from jwhonce/bug/1103772

Merged by openshift-bot
console_helper.rb:
  - replace hard-coded value of product logo and product title by
    dynamic value from Console.config.env
console.conf:
  - add PRODUCT_LOGO and PRODUCT_TITLE parameters
php cart: dynamic, controllable php.d seeding

Bug 1082963
https://bugzilla.redhat.com/show_bug.cgi?id=1082963

Scan the cart-provided and system `php.d` directories to determine what
php modules are available, and enable them by appending the `.ini`
contents into the file `openshift.ini`, located in deployed cartridge's
`php.d` directory.

Allow users to enable or disable php modules by setting
`OPENSHIFT_PHP_{MODULENAME}_ENABLE=true/false`. Modules are **disabled
by default**, so modules installed after an app is deployed will have to
be enabled by setting the appropriate environment variable via `rhc env-set`.

Additional changes/squashed commits

* Obtain PHP version from ident variable `OPENSHIFT_PHP_IDENT`

* `php_module_scan` function `scan_for_php_modules` depended on
`OPENSHIFT_PHP_VERSION` being set, but this isn't necessarily going to
be the case.

* Amended `cartridge-lifecycle-php.feature` tests to include checks for
enable/disable PHP module via user env var

* Added needed step to `cartridge-php_steps.rb`