merge 'delete-route' and 'unmap'

use --delete to perform delete-route's old functionality

Change-Id: I4df4bd274a646b5dbf8c29844c18a92ca04a9425