fixes some BigData bugs (but there are still some)
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta into develop