Post release 5.9.5
Update 5.9.5-SNAPSHOT to 5.9.6-SNAPSHOT
NXP-14904 Use vhosthelper to compute serverUrl, remove some duplicated code