Merge pull request #238 from jnugent/master

*8710* fix discrepancy in galley tab, move templates
*8787* Improve user creation script robustness
Relax certificate check for Travis build
*8787* Remove delays/timing problems in data build
PHP4 session cleanup
PHP4 session cleanup
*8787* Improve robustness of build scripts
*8848* Fixed invalid redirect after password change
Merge pull request #241 from MichaelThessel/master

*8848* Fixed invalid redirect after password change
*8787* Fix wait for Superfish init
*8787* Fix logout
Add missing constant import
*8787* Improve robustness of data build suite