REL-2100: Switched GeMS catalog server to functioning one.
REL-2100: Removed commented code.
Merge branch 'bugfix/REL-2100' into develop