Fix tripleo test cloud config

This is tested in production.

Change-Id: Ib24301fc287f046d7d3bd53fca2e966d40cb3189
Fix devstack image-cache script

Change-Id: Ia28ad64fb45234dabbb6dedd1a4c27b60f6969a7
Merge "Fix tripleo test cloud config"
Merge "Fix devstack image-cache script"