Fix build failure on 9.x

While on it:

• Pet portlint

PR: 195095
Submitted by: woot-woot@yandex.ru (PR) evgeni.dimitrov@gmail.com (patch)
Reviewed by: dpejesh@yahoo.com (maintainer)
Approved by: dpejesh@yahoo.com (maintainer)
MFH: 2015Q1