Merge "Upgrade commons-net 3.3 -> 3.4"