ensure Hybrid & Proc2015 do the same thing
Merge pull request #2436 from twobraids/processor2015-nits

Fixes Bug 1084182 -  ensure Hybrid & Proc2015 do the same thing