slowly merging premix changes as they are checked  - part 1
round 2 of premix integration
Merged refs/pull/6426/head from repository cms-sw
round three of checked changes from premixing
Merge pull request #6431 from davidlange6/premix_partial_141115_p3

Premix partial 141115 p3