Adapt comment in UserRepository
Add active flag to User
Explicit comment
Move cluster to Configuration
Move bucket to Configuration