fix phpMyAdmin config file

Fixes bug 974899
https://bugzilla.redhat.com/show_bug.cgi?id=974899
Bug 975708: Fix java7 marker regression
Merge pull request #2899 from VojtechVitek/bz974899_phpmyadmin_config_2

Merged by openshift-bot
Fix bug 971955: load users correctly from /etc/passwd
<common> bug 976173 oo-diagnostics requires bundler

http://bugzilla.redhat.com/show_bug.cgi?id=976173#c5
Merge pull request #2912 from ironcladlou/bz/975708

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-node] release [1.10.5-1].
Automatic commit of package [openshift-origin-cartridge-haproxy] release [0.5.3-1].
Automatic commit of package [openshift-origin-broker-util] release [1.10.5-1].
Automatic commit of package [openshift-origin-cartridge-jbossas] release [1.3.5-1].
Automatic commit of package [openshift-origin-cartridge-ruby] release [0.5.4-1].
Automatic commit of package [openshift-origin-cartridge-php] release [0.5.3-1].
Automatic commit of package [openshift-origin-cartridge-perl] release [0.5.4-1].
Automatic commit of package [openshift-origin-cartridge-python] release [0.5.4-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.10.5-1].
Automatic commit of package [openshift-origin-cartridge-phpmyadmin] release [1.10.3-1].
Automatic commit of package [rubygem-openshift-origin-console] release [1.10.5-1].
Automatic commit of package [openshift-origin-cartridge-jbosseap] release [2.4.5-1].
Merge pull request #2913 from pmorie/bugs/971955

Merged by openshift-bot
Merge pull request #2914 from sosiouxme/bz976173

Merged by openshift-bot