Swapping to local service declared in application.
Merge remote-tracking branch 'origin/sitewhere-0.9.6' into sitewhere-0.9.6