Fix minor Trilean bug.
Merge remote-tracking branch 'origin/master' into topic/safer-long
Merge remote-tracking branch 'origin/topic/safer-long' into topic/safer-long
remove SerialVersionUUID annotation for 2.10