puppetproxy: match role name to class name

Change-Id: Ibc3fdee89e591eeb1829e43fa760ed595da4caa1
Merge "puppetproxy: match role name to class name" into production