Merge pull request #4384 from nhr/openshift-origin-release-3

Updated VM guide for 3.0 & master