Merge pull request #298 from mballance-sf/master

Test fixups and correction for #317
Update for 1.5.4
- #(nobug) - Correct an issue with the recently-added checker for
unbalanced
  pre-processor directives. This could cause expansion of a macro within
an
  enabled region to cause part of the pre-processor stack to incorrectly
be cleared
Update tests to remove references to getItemIterator()