Merge "puppet-tripleo fork integration"