Wait until quantum resources are deleted.

Races on delete have occured where a quantum resource cannot
be deleted due to an associated resource delete being incomplete.

Fixes bug: #1195596

Change-Id: I52a358d05d30b9c50a771864d036156f00df67ab
Merge "Wait until quantum resources are deleted."
Don't install template-specific stuff

Change-Id: I49eab0e24c7bd8f2a6f22c0ff5a2cb062dfbf374
Merge remote branch 'upstream/master' into cloud-server