refs #2655: Fix Collapsible 'if' statements should be merged
refs #2655: Fix Local variables should not have the same name as class fields
Merge pull request #73 from razvan-tache/task_2655

Task 2655