OS-270 typo fix

Change-Id: I4103d290c5b71d5519a967dcdd3e230a45f1b089
OS-254: Don't create a _base stub on every launch

To avoid download the root image from Glance if it wasn't already in
_base, we tricked _create_image into thinking the root image was a
file that was already in _base. The file already in _base was an empty
file with the instance's uuid as a name. The problem with this
approach was that we weren't deleting the file after calling
_create_image. So, after every launch, there'd be one more file in
_base.

This patch has _create_image avoid download the base image in another
way. Rather than tricking _create_image into looking for a different
_base image, we just trick _create_image into not looking for a _base
image at all.

Conflicts fixed when cherry-picking to 1.5:

	cobalt/nova/extension/vmsconn.py

When cherry-picking to 1.5, took advantage of the opportunity to apply the same
treatment to ephemeral disk, if any. (ALC)

Change-Id: I6594ebeb3307ebd3d90a8fe38544874f3fb6d704
Merge grizzly/1.5 into havana/1.5.

Merges:
* OS-254: Don't create a _base stub on every launch
* OS-270 typo fix

Conflicts fixed:
	cobalt/nova/extension/manager.py
	cobalt/nova/extension/vmsconn.py

Change-Id: I8ca6496ac7b7a9d0959211a947bddbe595feb175
Merge havana/1.5 into icehouse/1.5.

Merges:
* OS-254: Don't create a _base stub on every launch
* OS-270 typo fix

Change-Id: Ie35996880e0952e29af54b4eab789091b93c30a2