Added the missing JBoss Nexus Repository
FIxed merge conflicts