Fix a null ref on creating roles.
Merge remote-tracking branch 'refs/remotes/AuroraDevelopers/master' into VirtualSimulatorDeveloper