Fixed content protection tests (TomP2P, H2H independent). Adaption in
H2H is pending.
Merge of Nico's share test improvements.
Merge remote-tracking branch 'origin/master'