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

Migrated notes on local DNS from drupal wiki module