No bug, manually update HSTS preload list - a=hsts-update
No bug, re-enable disabled HSTS tests. a=test-only
Bug 883582 - Use only domains likely to stay on the HSTS preload list in the test. r=bsmith, a=test-only
No bug, add missing parenthesis. a=bustage
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
Merge b2g18 to v1.1hd. a=merge