Merge pull request #5804 from sartura/openzwave_fix_include_path