Switch from junit-dep to junit
Merge branch 'seam230final' of github.com:zanata/zanata into seam230final