Fix handling of run_at_sunset/sunrise with offset#2412

acockburn merged 2 commits intoAppDaemon:devAppDaemon/appdaemon:devfrom

ekutner:fix_issue_2188ekutner/appdaemon:fix_issue_2188Copy head branch name to clipboard