Merge branch 'master' of https://github.com/SlickNik/reddwarf into shared-snapshots-master

Change-Id: I19f9174e4e9dd34e52adf67110c183e72806a7ca
Merge branch 'master' of https://github.com/SlickNik/reddwarf into shared-snapshots-master