JBTM-1031. == replaced with equals() in objects comparison where appropriate