TEIID-3031, TEIID-3032: Changing the ID generation to use GenerationType...

....AUTO, rename plan field to queryplan