Fix JDK6 compilation error
- EE 6 and Common Annotations
- use Endorsed Standards Override Mechanism