ckpt for merge
Merge branch 'master' of github.com:rhc54/orcm-staging
Complete integration with build system changes