ENG-4686 use equals() instead of == when comparing Long