SH-734 - also adding fix into the llcapabilitylistner test
SH-734 - also adding fix into the llcapabilitylistner test

gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm