Add OpenStack device class back in
Merge pull request #4 from zenoss/feature/upgrade_cleanups

Add OpenStack device class back in