commented out unused bpk config fields
Merge remote-tracking branch 'origin/master'