Move preserve port logic after and fine tune it a bit

Jose Castro Leonrequested to merge
preserve_port into master

Signed-off-by: Jose Castro Leon jose.castro.leon@cern.ch

Merge request reports