Decorate disk ids with the location alias so we can get it back later, and make unit tests pass
Added more logging details for setting agent env