Upgrade to Hapi 6

This *should* be straighforward, but has not yet been deployed for testing.