(PUP-1019) Remove ZAML

This commit removes the use of ZAML in puppet as part of the Puppet 4.x
code removal efforts.
Yup, I've added in a spec test and fixed the regression. Thanks for catching that.