Import librato/ec2-cookbook version 1f0fe2525b7ec263d73589a1afbc899ff527131d
Merged conflicts.