Merge branch 'alice' into mad-hatter

* commit 'b8aa08293':
  MB-38283: Stop PassiveStream repeatedly logging ENOMEM

Merged using strategy 'ours' given this is a backport of code already
    in mad-hatter.

Change-Id: I8103d020686c9319e487ae9ff0e26ad7e3c5d4ba

Author: daverigby