Hiera variables specific to SPB
Specific settings for QA (or prod?) environment
Diazo rules for gitlab and redmine
Merge branch 'spb-dev' of github.com:colab-community/colab into spb-dev

Conflicts:
	src/proxy/diazo/gitlab.xml