Context Ref should not be mandatory on a saved query. Also, query id should be generated.
Authored by: b_calderwood 2012-11-01
Parent: [r6466]
Child: [r6468]