CELIX-169: Add port-collision auto-correction to discovery

git-svn-id: https://svn.apache.org/repos/asf/celix/trunk@1632567 13f79535-47bb-0310-9956-ffa450edef68