Further SSH driver tidying and canonicalisation across entities
Updating the Storm entity