Fixing broker functional tests:
  - PHP version selection based on OS
  - Creating user account for functional test on Origin
Merge pull request #1878 from kraman/bugfix

Merged by openshift-bot