GCP-7685 refactor
Merge branch 'master' of https://github.com/digitalabs/IBPWorkbench
GCP-8043
Merge branch 'master' of https://github.com/digitalabs/IBPWorkbench

Conflicts:
	src/main/webapp/VAADIN/themes/gcp-default/styles.css
Merge branch 'master' of https://github.com/digitalabs/IBPWorkbench