Fix check_nvp_config erroneous complaint

Add the missing ingredient to the boolean test. This is
not a straight cherry-pick from a trunk fix, as the
utility tool has been renamed in Icehouse.

Closes-bug: #1265353

Change-Id: I9eb8fc1f85b16fbae83930fa9723db1fd25eeb5d
Merge remote-tracking branch 'upstream/stable/havana' into stable/havana-shashank