add migration strategy for old system principals
switch from 'system' to 'service' principal
jshint fixes
simplify logic
clean up service error handling