Cleaned up some dirty whitespace and long lines in the schedule_instance method
Merge branch 'master' into feature-windows-configuration-status
Cleaned up some long lines and dirty white space in linux local store as well.
Dirty whitespace and long line cleanup in local store handler
Dirty whitespace cleanup in hva handler
Created the image os type column
Some more code cleanup
Removed a useless route in the images endpoint that basically said 'crash if called'
Added os_option to 'vdc-manage image' and cleaned up the code in there a bit
Added the os_type option to demodata images in vdc.sh
Made removing image md5 sums optional and fixed a mistake where md5sums were recalculated when not needed and not recalculated when needed
Added a column to instances to keep the encrypted windows administrator password
Dirty whitespace cleanup in the kvm driver and hva collector
Even more dirty whitespace cleanup
Merge branch 'master' into feature-windows-configuration-statusV2

Conflicts:
	dcmgr/lib/dcmgr/drivers/kvm.rb
	dcmgr/lib/dcmgr/rpc/hva_handler.rb
Renamed the windows support migration file from 19 to 20
Somehow the merge conflict resolving code in hva_handler didn't get committed
Merge branch 'master' into feature-windows-configuration-statusV2

Conflicts:
	dcmgr/lib/dcmgr/drivers/kvm.rb
When starting a Windows instance, wait for kvm termination, mount metadata drive and read the encrypted password from it. Then start up the instance again.
Added a timeout to the windows configuring status and made both the timeout and sleeptime configurable in hva.conf