parser fix to recent change
Merge pull request #3063 from aparajit-pratap/fixParser

Fix for regression due to parser changes
added test cases for parsing non-assignments in code block node
Merge pull request #3066 from aparajit-pratap/fixParser

Cross-merge from master for PR #3063, #3065