Merge pull request #95 from DenisKnoepfle/master

Clean up / Stability fixes
Fix client and launcher test

Had to add a shutdown at begin to ensure that no service is already
using the given port. Changed the port used in SpotterServiceClientTest
to 11337, the same exotic port as in ServerLauncherTest.

Change-Id: I2a7867c47dfe4ff90cce300cf1db331cceab749b
Signed-off-by: Denis Knoepfle <denis.knoepfle@sap.com>