Merge changes from topics 'embms-cleanup-action', 'embms-download-token'

* changes:
  Modify testapps to exercise ACTION_CLEANUP
  Change destination paths to comply with enforcement