Update plugins to latest revisions merged from stable-2.8

No functional changes.  Changes from stable-2.8 are not applicable
on master and are discarded.

Change-Id: I265c19ff9aa806a3e75287ce69311ee6836845aa
4 files changed