Set up the framework for new system
Merge branch 'master' into openshift