Revert "Bug 1111077 - Ensure frontend and state in sync"
Merge pull request #5551 from jwhonce/revert-5546-bug/1111077

Merged by openshift-bot
Revert "Bug 1112522: Getting rid of OPENSHIFT_PHPMYADMIN_LOG_DIR.erb in the gear env/ directory"
Merge pull request #5554 from jhadvig/bz_1112522_undo

Merged by openshift-bot