Added test for #1658
Extended for-statement tests for #1658 by testing with java keywords
Fixed #1658 where identifiers with names that are the same as java keywords were not properly quoted
Fixed .src files for tests that failed because of the changes for #1658