Don't reload haproxy and use ensureRunning=true

the ensureRunning option results in cfn-hup doing a restart and the
hook does a reload. these two options result in the failed state
of haproxy.

This patch rolls the two into "reload-or-restart", which is run from
cron.

bug 1201621
Change-Id: Idb42b3915cb86c613876b67abf1c6999972e19e2
Merge "Don't reload haproxy and use ensureRunning=true"