cleanup to device config stuff
Merge branch 'develop' into geraldl/admin_devconfig
Add MojioUpdate as part of entityType enum
Guid ID
Merge branch 'geraldl/admin_devconfig' into develop