This depends on https://review.openstack.org/#/c/6506/ for image filtering support. Do not merge this until that has been merged. Change-Id: I12e420f153b7b8323956e741bf9a202e31daa3b5