EAGLESIX-2651: SetDifference: better sync w/ 2.6.5 code and tests