Update aliases for later puppet versions
Merge branch 'master' into next