fixes #4641 - Ensure default role only after save/update. Change default role permissions
refs #4641 - update to functional test
Merge remote branch 'origin/develop' into develop