merged updates from doc team for CLI examples
Use hidden doc test other than ec2

Fixes failing test.
Merge branch 'EronHennessey-example_updates' into develop

* EronHennessey-example_updates:
  Use hidden doc test other than ec2
  merged updates from doc team for CLI examples
Readd dff35d2cfd73f66cb58d20ba33c82e8a213788db

This was reverted in the doc merge commit.  This is in fact
the correct way to specify multiple filters.