Fix HSS interop - homestead wouldn't start with an HSS
Merge branch 'hss-fix' into dev