Minor code changes
Merge branch 'stable/folsom' of github.com:tmetsch/occi-os into stable/essex
Minor code changes