Updates to ensure default context events are mapped and initialized
Merge branch 'develop' of github.com:RandoriAS/randori-framework into develop