Merge changes from topic 'PHENOMENAL_CHANGE' into nyc-mr1-dev

* changes:
  Use collector specific helper classes
  Avoid duplicate class for mark compact