Fix how images are expected in /var/lib/glance/images.

Change-Id: Ia6847b19d22b72bb3c7b77df2d248435b25d5cb8
Merge "Fix how images are expected in /var/lib/glance/images."