Fix merge issues between cherry picked pom from branch GOA-1805_Create_indexing_scripts and master.
Fix merge issues between cherry picked pom from branch GOA-1805_Create_indexing_scripts and master.

ebi-uniprot/QuickGOBE,ebi-uniprot/QuickGOBE,ebi-uniprot/QuickGOBE,ebi-uniprot/QuickGOBE,ebi-uniprot/QuickGOBE