Fix a few issues with merge - broke tests, fix ephemeral disk, fix sparse disk
issue
add unit to support other changes
Merge branch 'sprint_20131101' of github.com:openstack-vmwareapi-team/nova into sprint_20131101