resolve Paul's review comments
Merge branch 'ENG-6590-inline-limit-for-aggregate' into ENG-6591-partial-aggregate
Add variable to record how many spaces to indent for inline node of inline node
Merge branch 'ENG-6590-inline-limit-for-aggregate' into ENG-6591-partial-aggregate