(RAZOR-380) Normalize inconsistencies in attribute names These are the server-side fixes for [RAZOR-380](https://tickets.puppetlabs.com/browse/RAZOR-380)