Merge branch 'openshift' into master-2
port
http server
package update
Merge branch 'master-openshift' into master-github