Fix Heat/Cloud formation catalog template

Cloud formation and Heat API ports where mixed.

Change-Id: I029592c4821bb93c8a1dd91519f30908efd56627
Closes-Bug: #1267355
Enable server-side and client-side logs for libvirt

Need this to diagnose libvirt Errors in the gate

Change-Id: Id46137a71d17abc8bfab66b14ab567d81a31f018
Related-Bug: #1254872
Merge "Fix Heat/Cloud formation catalog template"
Merge "Enable server-side and client-side logs for libvirt"