Let's make that a separate issue, to get our experts on the job.  https://tickets.puppetlabs.com/browse/RAZOR-195