Fix cleanup for murano

Change-Id: Ib058a87f6f3c29d7b3c152b369ed8e603b5d3928
Related-Bug: #1311590
Merge "Fix cleanup for murano"