Validate rule.id before adding handler with it.
Merge branch '4.0' of github.com:EFForg/https-everywhere into 4.0