conditionals are now introduce indentation scope
added test for inherited indentation
Merge pull request #1437 from Microsoft/formatting_conditionals

conditionals are now introduce indentation scope