BUG-1305: fixed unknown nodes and issue with single quote in antlr grammar.

Change-Id: I6721cfc3b2042f3564996f08d155201cc2ff2d43
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Merge "BUG-1305: fixed unknown nodes and issue with single quote in antlr grammar."