Conflicts:
manifests/provision.pp
Cherry-picked from 050fa67b23 in master.
Change-Id: If5e05b54aa8cff01a6b48ee1c3bcb951758fff95
Conflicts:
manifests/provision.pp
Cherry-picked from 050fa67b23 in master.
Change-Id: If5e05b54aa8cff01a6b48ee1c3bcb951758fff95