correct PR UP-3691 - class merged wasn't on a good package path org.esco... moved on org.jasig, also change all bean references