2017-04-14 - releng
00:59	<Amir1>	three cherry-picks failed to merge, skipped them 93dad5bec8e937ef93bdd63046b0bbbf14ad9722 92c7d0b002a02ff46a00e79d6d89fe83d5f65c17 21d60a478ffb21160049679eea235bdb1010a489	[releng]