Merge "Revert "Drop keystone dedicated ports""