More fixes
Merge branch 'develop' of https://github.com/Particular/NServiceBus.NHibernate into develop

Conflicts:
	src/NServiceBus.NHibernate/TimeoutPersisters/NHibernateTimeoutStorage.cs