Clean up OptOuts for GiraphGraph given test naming chnages.