Switch to using a $NODES_JSON to register nodes
Add needed patch for dib-utils
Allow patch to fail gracefully so the cherry-pick doesn't start failing once it merges