Fixing lint
Merge pull request #14879 from nmadhok/fix-lint

Fixing lint
Fix incorrect conditional in spec
Merge pull request #14884 from terminalmage/update-spec

Fix incorrect conditional in spec
Adding a check if the respective pkg.upgrade cmd fails.
Fixing lint issue in pkgpng.  Reverting changes in brew.py because of unit tests failures.