Merge "Resolve Bug:593. Persister should communicate via OSGi SR instead of TCP."