modified the location of limit/offset values sent to ElasticSearch
previously, values were one level too deep (eg query->query->limit)
values are now at second level (eg query->limit) so as to apply to the full search query

part of OOIION-1208
commented code cleaned up
Merge pull request #1507 from brianmckenna/OOIION-1208-cs2

OOIION-1208 part 1/2