JGRP-1893 for 3.5

Address thread safety issues discussed in JGRP-1893