Clean up declared queue when SUBSCRIBE handler fails
merge bug26238 into stable
merge stable into default