Update botocore to use dev branch of jmespath

This also required a change to the s3 page configs.  Based
on feedback, the 'or' token was replaced with '||'.
Update test with new 'or' jmespath syntax
Merge branch 'jmespath-or' into develop

* jmespath-or:
  Update test with new 'or' jmespath syntax
  Update botocore to use dev branch of jmespath