am ddf07b41: Merge "Reuse system properties for p2p" into jb-dev

* commit 'ddf07b41167bbcb4e74d0af5dd43175513963c2d':
  Reuse system properties for p2p