bug 1040926: consolidate node definitions
Merge default -> production

--HG--
branch : production