Update EC2 to latest model

This switches from CLI specific filters to filters provided
in the operation documentation itself.
Merge branch 'ec2-update' into develop

* ec2-update:
  Update EC2 to latest model