Fixed some bogus conditions.
Fixed some bogus conditions.

These were causing the breakage caught by the tests in the previous
commit. I'm not sure why someone thought this would test for set
membership.

kylehogan/hil,meng-sun/hil,henn/hil,meng-sun/hil,apoorvemohan/haas,SahilTikale/haas,apoorvemohan/haas,kylehogan/hil,SahilTikale/switchHaaS,CCI-MOC/haas,lokI8/haas,kylehogan/haas,henn/haas,henn/hil_sahil,henn/hil_sahil,henn/hil