Merge "Add stlport exception handling tests"