Squashed commit of the following:

commit 42ff91b70ebc9719048c1676548683cdabfaa433
Author: Ian Craggs <icraggs@uk.ibm.com>
Date:   Thu Jun 29 10:38:20 2017 +0100

    Proxy ports

commit c7cb7c1372796d26fd09cc9d8a098fd96e0d00d2
Author: Ian Craggs <icraggs@uk.ibm.com>
Date:   Wed Jun 28 19:46:19 2017 +0100

    Fix build.xml syntax

commit 371565969967a2bbad9965ec87019c57f63beb5f
Author: Ian Craggs <icraggs@uk.ibm.com>
Date:   Wed Jun 28 19:45:05 2017 +0100

    Fix mqttsas2 invocation

commit ec2d18d37c533d4df3a56cc5d28feb3334259d62
Author: Ian Craggs <icraggs@uk.ibm.com>
Date:   Wed Jun 28 19:34:10 2017 +0100

    Change broker port to allow proxy to start on Hudson