Merge pull request #5901 from sartura/openzwave_gcc_and_install_fix