replaced org.apache.commons.lang with org.apache.commons.lang3 everywhere
Merge remote-tracking branch 'origin/sr' into sr