Since I'm updating documentation anyway, and as these fixes don't
fit well into v1 or v2 design documents, I figured a small commit
here to correct the 'VM' terminology to be 'amphora' where
appropriate is called for.
Change-Id: I5f62f9fb62534f48de3d761c64419c08c66fed64