Bill retains harshest measures of legislation adopted in March, including death penalty for certain same-sex acts