Get baseURL from env var if exists
Renamed client aware trait
No trailing slash on repository urls
FindById method
Fixed conflicts in URL merge