Merge host and port field in profile editor

issue4350
review14681002

--HG--
extra : amend_source : d64d5616bd91a05f40a8a1f38d80b17e2df77712