PROTON-676: applied patch from dominic

git-svn-id: https://svn.apache.org/repos/asf/qpid/proton/trunk@1628292 13f79535-47bb-0310-9956-ffa450edef68
PROTON-676: Removed file added in error

git-svn-id: https://svn.apache.org/repos/asf/qpid/proton/trunk@1628314 13f79535-47bb-0310-9956-ffa450edef68
PROTON-693: If the system doesn't have port definitions for amqp/amqps
use the default values of 5672/5671.
- Not all systems have /etc/service (or similar) files that define
  these ports, but our tests use them and the defaults are these
  strings.

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