Merge changes Ie8d98359,I4d5cadfd

* changes:
  Fix a bug in RequestReassignment#toString
  Cleanup some of the PANS code