Manually merge improvements made in for_puppet

The relevant improvements should have been made here and then merged
into for_puppet, but I unfortunately lacked the discipline.
Merge branch 'master' into for_puppet (strategy ours)
Small note on the value of locations_jboss
Merge branch 'master' into for_puppet