Bug 868257 - watchPosition only sends one location r=stuart
Merge latest green inbound changeset and mozilla-central
Merge mozilla-central and inbound