CXX-72 Remove commented out conditional
CXX-72 Add port overrides for client demos missing them