openzwave: fix gcc7 compile and remove bad patch