Merge "Reuse system properties for p2p" into jb-dev