Bug 1894756: Set extra headers correctly for client_connnection

So that the wstoken is seperate from extra headers and we can define
the full header in form field

Also have the correct nav menu when editing connection

Change-Id: I12a3b8d699d8da55718dba81c9ad31cfab9d2300
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>