ref #8162 move term related classes from persistence(.dao.)common to .term