Merge 3.1.0 into stable.
Queue lease test with a consumer
Merge bug25549
stable to default