Merging the PI compat changes for the plugin

Sidekick: @jstenhouse 
FYI: @briandela @tmacie @serened @christynicol 

This is moving the Wikipedia plugin changes into the public repo, we will republish the plugin after and have our first PI compat plugin published.