refs #41 - always set originator of leave message nonoperational, unit test
Merge branch '2.x' into 3.x