Use a more descriptive message for upgrading volume

While I'm here remove deprecated stuff.

Ticket:	#6823