initial checkin from ec2 appd puppet master