Unsubscribe errors reject the message and are not fatal

Change-Id: Ia4177b1d3afee60c6e521ba2d2c6edb404c6c5e0
Merge remote-tracking branch 'origin/master' into deployment

Change-Id: I6b2d1e15da69d35b54e0394027f26bf64f63ae6d