MARMOTTA-325 : Remove use of backports that uses unchecked generics