Revert "fix where providing a SERVICE_NAME for a container with multiple ports exposed would cause services to overwrite each other"
Revert "fix where providing a SERVICE_NAME for a container with multiple ports exposed would cause services to overwrite each other"

This reverts commit efdab227752c13183a4f6a29007fa80aa57e10b3.

This fix is poorly thought out and forces a '-PORT' onto the end of a
service name even if there are already user-supplied unique names for
that service/port combination (e.g. SERVICE_<PORT>_NAME is defined).

The solution to overwriting services in the face of multiple ports is
for the user to supply unique names.
An error might be generated if unique names are not provided, but any
auto-generated unique naming scheme like this is not general enough and
causes issues for many use cases.

udacity/registrator