PU file for 2018

Merged Kevin Pedro requested to merge github/fork/kpedro88/Run2_2017 into Run2_2017

also move WP lines to 2018 block

Merge request reports