Delete assembly and plan by name as well as id.
Fixes-bug: #1317975

Change-Id: I1a991fbba8afa4137151f8af9a496731cabf2895