Added more multitenancy support

Added comments
Prepared for Clustering support
Added clustering support
2.2.5-SNAPSHOT

Incremented version