No bug: add missing node definitions; a=nodechange,orgonly
Merge default -> production