Merge "Consistenly Throw IOExceptions from IpSecManager" into oc-dev