Revert "Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta"

This reverts commit a9bf7e4fa56f00e26e09a5fae002686eb65631df, reversing
changes made to cdb3223db7439a9f8fd7fb5159ffd52f6da0ecb7.

Signed-off-by: Peter Ansell <p_ansell@yahoo.com>
Reverting the erroneous merge by Sebastian according to the instructions in INFRA-6876

This reverts commit c576351a57b4de9d75f6cb8f5eec631666c2a5c2.
This reverts commit 4b8b86802a9814f8cffbb03a5262b00f7a42f9a9.
This reverts commit be31f8a736c8ae7b42ff194992b503b7ae0159a4.
This reverts commit a9bf7e4fa56f00e26e09a5fae002686eb65631df.
This reverts commit 4aa87dbe5c121476176292416e36e71f613be83e.

Signed-off-by: Jakob Frank <jakob@apache.org>
fixed wrong version numbers - update to 3.1.0-incubating
(partially cherry picked from commit cdb3223db7439a9f8fd7fb5159ffd52f6da0ecb7)
Merge branch 'develop' into master for the 3.2.0 release
[maven-release-plugin] prepare release 3.2.0
[maven-release-plugin] prepare for next development iteration