Fixed pylint errors

Fixed two real pylint errors and two false positives were silenced.

Change-Id: Ic32918d3ba95fab578ce43a2565a060f633ecc03
Closes-Bug: #1334847