[plugins]: Mainline merge @145344

[Diego Novillo]

I've merged mainline into plugins in preparation for a
plugins->mainline merge in the next few days.  I will start preparing
separate patches to simplify review.

Bootstrapped and tested on x86_64.


Diego.