CB-4890: fix edge and backport to 3.0, 3.1
Update 3.1.0 plugin feature values to align with edge (56c0f5).