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 '||' a while back.