fix manual_mergepoint, update to new otie paradigm; closes #1419
fix manual_mergepoint, update to new otie paradigm; closes #1419

schieb/angr,angr/angr,iamahuman/angr,iamahuman/angr,iamahuman/angr,angr/angr,schieb/angr,angr/angr,schieb/angr