Merge "Switch policy/api rest port from cluster to node"