Merge changes I0d635067,I1424973b

* changes:
  Simplify equals() method of ServiceState
  Update ServiceState.hashCode()