Fixed a bug which appears when hostname contains a point (.)

  Author: Antoine Abélard
  Date:   Mon Aug 04 14:29:00 2014 +0100

    With the current implementation, the OpenShift Origin deployment fails when there is point (.) in the hostname.
    This new implementation fix this bug.