Merged -r9556:9560 from jcorgan/scr into trunk. Adds gr.scrambler_bb and gr.descramb...