Importing from trove-client compat first

- Switched the logic so that the compat version is imported first

Fixes bug #1250237

Change-Id: I7650fc6c3ce93164ca8bee610d5fe2293df3ecc7
Merge "Importing from trove-client compat first"