Fixes #6780 - Remove elasticsearch port on uninstall

Ah, I didn't know core/non-core policy was the issue we had, thanks for checking.