Brings the CLI in line with pagination changes.

This resolves the test failures I see from the pagination changes in botocore. Review please? @jamesls