Removed duplicate client declaration that was preventing the context
from loading.
Merge branch 'fixMergeProblemWithIntegrationTests' into makeOwnerTheSourceForChangesByDelegate