Refs #9253. CMake tweaks for Fedora 20 rpm building.
Merge branch 'feature/9253_fedora20_rpm' into develop