Made changes to add framework 1.3.3.1 support
Fix objectclass equal check
merge from 1_1_X