Use Puppet boolean for better consistency

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