Port PID tweaks to 2016Draft settings

As discussed in the previous MR, we should still keep the modifications to the PID lines. I applied them by hand from the diff:

git diff TCK-0x212a1600..TCK-0x21311606 -- Hlt/HltSettings/python/HltSettings/PID/PID_pp_May2016.py

@olupton @landerli @bsciasci @mfontana, please have a look. @sstahl, @mvesteri