Merge "Revert "Update volume-status waiter for new cinder attach""