Fix minor inconsistencies

 * No more kernel, but an image upload.
 * `glance image-list` output now matches the documented image upload.
 * Try to respect conventions.

Cherry-picked from https://review.openstack.org/34422

Change-Id: I3c349e48d2396d8ca269503fb5095eb1a4012b37