Merge branch 'dev'

Conflicts:
	cloudbaseinit/metadata/services/configdrive/windows/disk/virtual_disk.py
Merge branch 'master' into dev

Conflicts:
	cloudbaseinit/metadata/services/configdrive/windows/disk/virtual_disk.py