Remove unused methods and add annotation
Fix template expansion test
Comment out failing tests
Remove unused test cases.

The methods removed were testing path conflict resolution which
we don't do anymore.
Organise imports
Remove unused methods
Clean up imports, methods, line breaks
Merge pull request #1150 from bpindelski/blitz-testfix

Fix tests in utests/ManagedRepositoryITest