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>