allow access fix
Merge branch 'master' into openshift
allow access fix
Merge branch 'master' into openshift