Fixing depMgmt/

--HG--
branch : annotations-take2
Mass re-port back to java-annotations

--HG--
branch : annotations-take2
Merging annotations-t2