bug 898431 - cherry-pick client.py rev. b20eab2be2dc from mozilla-central r=briansmith a=Preeti
bug 898431 - Update NSS to NSS 3.15.4 (NSS_3_15_4_RTM) r=me a=Preeti