~ cq: added missing '@Override' annotations
~ cq: added missing '@Override' annotations
Merge branch 'bugfix/TOMEE-1378' into develop-kasi