updated opencga-server catalog.properties with new email config property names
conflict resolution