[eclipse-m2e-core/f20] (2 commits) ...Fix jar locations for f20+