please stop skipping the control tests
Merge pull request #1214 from dajohnso/stop_skipping

please stop skipping the control tests
Dockerbot updates and IP check change
Merge pull request #1216 from psav/dockerbot_ip

Dockerbot updates and IP check change
Fixed mistake made with IP check
Merge pull request #1217 from psav/dockerbot_ip

Fixed mistake made with IP check
Fix locator that was only upstream but is now also downstream