Use Puppet boolean for better consistency

Change-Id: I894af9499f1ea2fc255aa62fa6522c04a32d8a7c
Merge "Use Puppet boolean for better consistency"