Add support for passing through Origin header.
Bug 1028327 - No message about "skip_maven_build marker found .." after git push jbosseap-6 and jbossas-7 app with skip_maven_build marker added
Add retries in functional api
Bug 1042255 - reuse timer for execute_parallel_action calls

* Ensure execute_parallel_action uses the same hourglass object for
  all operations
* Refactor using PathUtils.flock to remove redudant code
* Remove unused code
* Replace all calls to File.join with PathUtils.join. security issue.
* Optimize obtaining list of gears
* use node.conf rather than hardcoding values
Merge pull request #4391 from jwhonce/bug/1042255

Merged by openshift-bot
fixup naming
Merge pull request #4394 from danmcp/master

Merged by openshift-bot
Attempt to add MariaDB 5.5 support through SCL based on recent MySQL commit
Attempt to add MariaDB 5.5 support through SCL based on recent MySQL commit
mysql cartridge was using a postgresql variable
update schema to latest jboss eap 6.2
<oo-diagnostics> OSE version-agnostic - bug 1043340
Merge pull request #4397 from sosiouxme/bz1043340

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-node] release [1.19.5-1].
Automatic commit of package [rubygem-openshift-origin-common] release [1.18.4-1].
Automatic commit of package [openshift-origin-msg-node-mcollective] release [1.19.2-1].
rename jee to java_ee_6
Bug 1045995 - Fix get_gears node implementation
Merge pull request #4403 from pravisankar/admin-chk-bugs

Merged by openshift-bot
Bug 1047920 - application edit route should not be enabled