merge 'remove/delete-domain' into 'unmap-domain'

Change-Id: I4f5413c6fcdf5244c20c58339c752a8ee8c72bdd