Merge "Correct the usage on listing neutron ports" into mcp/queens