Merge pull request #147 from cbare/develop

fix for SYNR-728, cache.retrieve_local_file_info sets cacheDir and files incorrectly for zip files
Add support for sam content-type
Merge pull request #148 from larssono/master

Sam content-type
SYNR-656
SYNR-656
Merge pull request #149 from brucehoff/SYNR-656

Synr 656
_downloadLocations should return only file info, not a modified entity
refactored _getWithEntityBundle to require entityBundle parameter and optionally take entity
decreased maximum limit of query batch size from 5000 to 1000. see SYNR-731 and PLFM-2773