Plug and play branch needs several recent fixes

I need three fixes brought into the plug and play branch:

1 - the state collection fix from December
2 - the CDeviceLogger class from the group information commit
3 - the changes in the open merge request for no device migrations

When pull request #164 gets accepted - I'd like to merge in master for these commits.