Remove location info from logs where not available - EUCA-9361

EUCA-9361
Allow for deleted instances when updating volume state - EUCA-9416

EUCA-9416
Merge remote-tracking branch 'origin/dev/sjones/EUCA-9361' into testing
Merge remote-tracking branch 'origin/dev/sjones/EUCA-9416' into testing