Merge pull request #5210 from buddyspike/master ignore: correct handling of nested rules overriding wild card unignore