changes needed on Ubuntu 14.04 and SL7 build
Merge pull request #1 from gartung/sl7-ub1404-build

changes needed on Ubuntu 14.04 and SL7 build