Factoring out common functional test code
Merge branch 'master' into functionalTestBase

Conflicts:
	bundles/client/container/wab/src/main/webapp/WEB-INF/views/jsconfig/serverConfig.jsp
Merge branch 'master' into functionalTestBase

Conflicts:
	tests/functional/src/test/groovy/DashboardSwitcherSpec.groovy
Reactivating preferences functional tests
Merge branch 'master' into functionalTestBase

Conflicts:
	tests/functional/pom.xml