Merge "Bug 6396: Integrate ne-location-provider with clustering singleton service"