[FABRIC-763] Add option to preserve existing properties in PID

This time without smoke tests, as these seem to be unstable after switch to Arquillian