Keeping the locally applied patch, but bumping its version tag, to indicate it hasn't been part of an official NSS release yet.
Kai Engert