obvious fixes that went wrong in stephen's patch
obvious fixes that went wrong in stephen's patch

sebbASF/infrastructure-puppet,apache/infrastructure-puppet,sebbASF/infrastructure-puppet,sebbASF/infrastructure-puppet,apache/infrastructure-puppet,sebbASF/infrastructure-puppet,apache/infrastructure-puppet,sebbASF/infrastructure-puppet,sebbASF/infrastructure-puppet,apache/infrastructure-puppet,sebbASF/infrastructure-puppet,apache/infrastructure-puppet,apache/infrastructure-puppet,sebbASF/infrastructure-puppet,apache/infrastructure-puppet