fixes #8281 - remove id-name parameterization from puppetca
Fixes #6974 - Hitting Cancel button on New Org > Manually Assign goes to 404
Merge remote branch 'origin/develop' into develop