Revert "WIKI-969 Fix the usage of OrganizationService"

This reverts commit db5cfb4487175ddc29e038bab05fac7cf8fc4a03.
Upgrade depmgt version to 10-SNAPSHOT
SWF-2997 : Create cal-rest-api branch and update projects versions