Merge "Fixed a sporadic failure in test_delete_share_in_manage_error"