Bugfixes fixing ELB tasks broken after merge conflict

- Bad/reverse logic on skiping services with no ELB
- Removed check_rs_timeout by mistake!

Change-Id: Ibf77a2f335f946b7dbf321df75c6e85896c83106
Merge "Bugfixes fixing ELB tasks broken after merge conflict" into red_black