Merge changes from topic "retailDemo" into tm-dev

* changes:
  Allow holders of PROVISION_DEMO_DEVICE to provision a device
  Add new permission PROVISION_DEMO_DEVICE