Fix naming collision between locally defined function phi and variable phi name
Merge pull request #1952 from vkuznet/Fix_RecoPixelVertexing

Fix naming collision between locally defined function and variable phi.
Merge remote branch 'origin/CMSSW_7_0_X' into CMSSW_7_0_X