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

Fix `serverURIs` iterating in MQTTAsync.c

This commit fixes two bugs related to `serverURIs` iterating in MQTTAsync.c

1. Segfault occurs when there is no healthy connection in `serverURIs`

   Two off-by-one errors of the `currentURI` cause the issue. The first
   one happens when doing boundary check of `serverURIs`, and the other
   one happens when accessing `serverURIs` without checking the boundary
   first.

2. The first URI in `serverURIs` gets skipped when restricting
   `MQTTVersion` to a particular value

   `currentURI` gets increased *before* connection attempts in each
   iteration.
Signed-off-by: Lance Chen <cyen0312@gmail.com>

Updates the RPM packaging makefile

Replaces the build directory with the build.paho directory in the RPM
source tarball creation, otherwise the tarball may contain locally
generated files and fail to properly build the RPM package.
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>

Conflicts:
	src/MQTTAsync.c
	src/MQTTClient.c
	src/MQTTClient.h
	src/SSLSocket.c
	src/SSLSocket.h

Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>

Conflicts:
	CMakeLists.txt
	README.md

Proposal for non-SSL version error. Issue #251

Compile static ssl libraries with OPENSSL=1

Extend the willOptions initializer to include the new binary payload fields

Merge branch 'testcase-for-issue-190-without-serverURI' of https://github.com/JuergenKosel/paho.mqtt.c into fixes

Non-SSL version of the library report an error if the caller requests an SSL connection. Possible soluiton for Issue #251

Explicitly enable OPENSSL=1 for the static ssl enabled libraries.
Otherwise a linker error is generated when using the libraries.
Signed-off-by: Marcus Hoffmann <m.hoffmann@cartelsol.com>

Signed-off-by: Juergen Kosel <juergen.kosel@softing.com>

Merge branch 'regression-check-vs-uncover-issue' of https://github.com/JuergenKosel/paho.mqtt.c into fixes