This is a trade-off, it increases the base size some _but_ it
decreases the total size by a few hundred MB.

Partially-Implements: blueprint openstack-common-container

Change-Id: I1216deed122aa734e0c84325264a53711d94ea4c