Revert "Merge pull request #4519 from lsm5/new-node_conf"

This reverts commit 1164719ad9e0422fe02ab8085586bf4ac1e4bb2d, reversing
changes made to 10a79bc05fcc88a0b355444c6f2e48c8421531d1.
Revert "Merge pull request #4488 from lsm5/new-node_conf"

This reverts commit b821263d40132e3486d12261f2443e441d8d1d44, reversing
changes made to 7228732ae0626790d4360cfa4552a583ef68ff61.
Merge pull request #4609 from jwhonce/stage

Merged by openshift-bot