Fix a bug in Leaflet boundary setting. (2.4.0b)

Leaflet’s isValid method is now used instead of custom empty GeoJSON
object detection to avoid errors with certain GeoJSON files.
Resolve merge conflicts. (2.4.0b)