node-util: "conflicting TE rule" for openshift.pp

Fix problem seen in OpenShift Enterprise - not clear why not seen in
Online.

Bug 1155925 - error is seen when installing openshift-origin-node-util
https://bugzilla.redhat.com/show_bug.cgi?id=1155925
Merge pull request #5904 from sosiouxme/bz1155925

Merged by openshift-bot
fix bz 1156361. Race condition between destroy-app and configure.
Merge pull request #5908 from rajatchopra/master

Merged by openshift-bot