Comment out code that causes deployment to fail with a 'Keystore was tampered with' error under GF4.  Not sure what the removal will break, but not being able to deploy is possibly worse(?).
Use http rather than https for up-checks
Use http rather than https for up-checks (really, this time)
Fix un-portable code that grabs first byte of version string
Kind of a hack, but don't do anything to the root user, if 'root' was specified as system_user in config.
Merge remote-tracking branch 'predictivelogic/master'