Merge "Rework Exception Handling for IpSecManager" into pi-dev