Ensure plugin dir is zapped before rebuilding
Merge branch 'master' into tp-2.4.0-sparql