Default HSS port to 3868
Merge branch 'default_hss_port' into dev