More generic solution to the blkid parse problem

References: 230f488ba8 and fa25d9f0e1
X.509 cert: fallback to root if no user specified
Merge branch 'master' of github.com:dberzano/amiconfig
Support for OpenStack ConfigDrive