Merge "Fix docker host at OpenContrail 4.0"