BZ1083475 - HA scalable application DNS is not deleted after app is destroyed
Merge pull request #5240 from calfonso/bz1083475

Merged by openshift-bot
BZ1086104 - oo-accept-node needs to read tc setting from node.conf

* It throws error message "TC htb qdisc not configured" when run oo-accept-node
due to TRAFFIC_CONTROL_ENABLED=false by default in /etc/openshift/node.conf
Merge pull request #5254 from calfonso/bz1086104

Merged by openshift-bot
Fix formatting