add sample data conf file to default to creating sample alerts every 10 mins
merge upstream doc changes