Merge pull request #740 from afs/jena1837-part2

JENA-1837: Default for maxBasicQueries; protect against bad config