Maint/puppet 4/remove property shadowing