Fix merged NSS stuff for 3.0.0 (hopefully)

2014-11-07, Daniel Atallah