UPT 5.1 incremental changes for LDAP Import, Struts 2x upgrade