Merge changes from topic "apexdenrollback"

* changes:
  Snapshot and restore DE(user) apex data.
  Snapshot and restore CE apex data directories.