Synch'd submodule commits

Update sub-modules to pull in latest versions of nif.xml