Updating build section to make use of OPENSHIFT_DATA_DIR.
Merge branch 'master' into openshift/master
Updating build section to make use of OPENSHIFT_DATA_DIR - not as an env variabe.