Fix EC2 DescribeTags filter

Support resource-id and resource-type as the filter key_name for
describe_tags.

Fix bug 1197294

Change-Id: Id7deb28803b0c93c5077306be9afa5ddf1e76a32
Merge "Fix EC2 DescribeTags filter"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp