undo unnecessary reording of permissions
Bug 1076032 - Attempting to unlock closed file descriptor

* Add guard to stop attempting to unlock a closed file descriptor
Merge pull request #4952 from jwhonce/bug/1076032

Merged by openshift-bot
add xpaas tag to eap cartridge
Merge pull request #4953 from bparees/eap_to_xpaas

Merged by openshift-bot
[origin-server-ui-163] Adding support to query apps owned by the user
LIST_APPLICATIONS_BY_OWNER and LIST_DOMAINS_BY_OWNER only support @self as the owner argument
Bug 916758 - Give better message on config failure
[origin-server-ui-163] When filtering by owner must respect token visibility
Merge pull request #4956 from bparees/binary_deploy

Merged by openshift-bot
Merge pull request #4957 from danmcp/master

Merged by openshift-bot
Automatic commit of package [openshift-origin-cartridge-phpmyadmin] release [1.19.2-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.22.1-1].
Automatic commit of package [openshift-origin-cartridge-haproxy] release [1.22.1-1].
Automatic commit of package [rubygem-openshift-origin-frontend-apache-mod-rewrite] release [0.5.1-1].
Automatic commit of package [openshift-origin-cartridge-jbosseap] release [2.15.1-1].
Automatic commit of package [openshift-origin-cartridge-jbossews] release [1.21.1-1].
Automatic commit of package [openshift-origin-cartridge-postgresql] release [1.22.1-1].
Automatic commit of package [openshift-origin-cartridge-jenkins] release [1.18.2-1].
Automatic commit of package [openshift-origin-cartridge-mysql] release [1.22.1-1].