Merge changes I284d2c65,I6ac872b4,I23a087f1,I9d7f7553,I0b54beee

* changes:
  [findbugs] Fix TrackingId.equals()
  [findbugs] Ensure that statement is closed
  [findbugs] Remove dead store to local variable
  [findbugs] Use key to remove entry from HashMap
  [findbugs] equals() must return false for null argument