Update to use new tables (working creating and editing grade_model) -refs BT#8052