Fix indentation in ec2.py
Merge pull request #8119 from adamchainz/devel

Fix indentation in ec2.py
Merge pull request #8135 from rmarchei/8102

fix issue #8102
fix get_distribution_version() on amazon linux