Updated fix for OPENAM-4253 - moved to a package structure more inline with previous changes made in 2010.
Updated fix for OPENAM-4253, review FR-386 - moved to a package structure more inline with previous changes made in 2010.