Update template for newer puppet versions
Merge branch 'separate_subnets_from_pools' into movealong