Fix where clauses in greylist

Change-Id: Ie1877311ce2c2e61900ea546efbbf61e329e458d
Remove unused sys import in bootstrapper

Change-Id: I8276bdba25cf7354a7cfbd8f4d7041d07661c8b1