[SWITCHYARD-1603] - Synchronized context creation
Merge remote-tracking branch 'upstream/master'