Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fix OOIION-674 Set resource_type in Platform Agent to be PlatformDevice
Merge pull request #491 from carueda/fix_OOIION-674_set_resource_type_to_PlatformDevice

Fix ooiion 674 set resource type to platform device