More rebase failures corrected.
More rebase failures corrected.

gonuke/cycamore,jlittell/cycamore,jlittell/cycamore,gonuke/cycamore,Baaaaam/cycamore,rwcarlsen/cycamore,jlittell/cycamore,Baaaaam/cyCLASS,rwcarlsen/cycamore,Baaaaam/cyBaM,jlittell/cycamore,Baaaaam/cycamore,Baaaaam/cyBaM,Baaaaam/cyCLASS,gonuke/cycamore,gonuke/cycamore,rwcarlsen/cycamore,Baaaaam/cyBaM,rwcarlsen/cycamore,Baaaaam/cyBaM,Baaaaam/cycamore