Merge pull request #2264 from opscode/jdmundrawala/issue-2225

Improve detection missing WhatIf support
Merge pull request #2298 from opscode/jdmundrawala/11-issue-2225

Cherrypick pull request #2264 from opscode/jdmundrawala/issue-2225