Bug 1064631 - Wrap UID-based ip addresses and netclasses calculations
Merge pull request #5470 from brenton/BZ1064631

Merged by openshift-bot
Fix bug 1104228 - missing php-5.4 scl in PATH

Make sure all PHP 5.4 apps have "/opt/rh/php54/root/usr/bin" path
in OPENSHIFT_PHP_PATH_ELEMENT env var.

https://bugzilla.redhat.com/show_bug.cgi?id=1104228

Also, fix migration (wrong current version).