fix merge conflicts
fix merge conflicts

marsbard/puppet-alfresco,marsbard/puppet-alfresco,digcat/puppet-alfresco,marsbard/puppet-alfresco,digcat/puppet-alfresco,digcat/puppet-alfresco,digcat/puppet-alfresco,digcat/puppet-alfresco,marsbard/puppet-alfresco,marsbard/puppet-alfresco