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
*8823* submodule changes track ##jnugent/master##
Merge pull request #244 from jnugent/master

*8823* submodule changes track ##jnugent/master##
*8787* Fix test race conditions; make timing use const