Merge 'OS-249: Create base disks for ephemeral disks' into grizzly/1.4

Conflicts:
	.gitreview

Change-Id: I82294a5ad429fa26e0a7d9a8f2a58bd46066b1c3
Merge 'OS-249: Create base disks for ephemeral disks' into grizzly/1.5

Conflicts:
	.gitreview

Change-Id: I36fec6bf135db07851428b4e4324ba271492e996