Update notes for submitted changes

* Add the instnace uuid in the deleted blessed instance error msg
Update notes for submitted changes

* Merge 'Retry vmsctl discard on errors (OS-266)' into havana/1.5