Update CLI with latest botocore wildcard changes

A HierarchicalEmitter no longer requires an EventHooks
object so I've updated the parts in the cli that were
creating EventHooks for HierarchicalEmitter to not do
so.
Merge branch 'wildcard-refactor' into develop

* wildcard-refactor:
  Update CLI with latest botocore wildcard changes