Finished initial wave of Javolution switch for nsfdata