-added changes from errors due to merge from puppetlabs/master