Further fix to Generic ScopeIndentSniff accounting for differnet open tag indents

We previously ignored open tags that were inside conditions, but that broke some type of code. We now keep a stack of open and close tag indents and check which ones cancel each other out.
Merge branch 'master' into phpcs-fixer

Conflicts:
	CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.inc