Fix #1601 and #1845

Viewable on http://dockerdocreview.readthedocs.org/en/1601-ec2install/installation/amazon.html and http://dockerdocreview.readthedocs.org/en/1601-ec2install/terms/