AWS address some scaling issues

Derek Hudsonrequested to merge
aws-increase-thread-count into master

Addresses some of the issues with Indexer Queue acting as a bottleneck.

Merge request reports