Cherrypicked the fixes in redirect plugin
Picked up the new UIM-Core dependencies