Selenium version used didn't anymore work with the latest FF versions. Selectively merge changes in functional tests from master and hack around just enough to get most of the tests going again