* devel-2.6:
  Fix warnings/errors with newer pylint
  Fix decorator uses which crash newer pylint

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Bernardo Dal Seno <bdalseno@google.com>