fixes #508
improve the openshift create container form
Merge remote-tracking branch 'upstream/master'