use ec2-user instead of ec2_user

Change-Id: Ib630fb65a5f587f0c58eb4edd817126ce1dde689
Closes-Bug: #1301149
Merge "use ec2-user instead of ec2_user"