Remove trove from labs (moved to jclouds). https://issues.apache.org/jira/browse/JCLOUDS-102
Remove redundant imports
Factored out Client ID into MarconiApi.