Picked to master and rel_2_7. Minor conflict resolution required for rel_2_6 because trusty is not an option in that series.
Picked to master and rel_2_7. Minor conflict resolution required for rel_2_6 because trusty is not an option in that series.