Remove 'bot' from kwargs checking where it has been defined explicitly

Change-Id: I563953578f0ca425f1e0ef1e757a8b0b6b70c1c7
Merge "Remove 'bot' from kwargs checking where it has been defined explicitly"