Initial work for 3.0.6.
    
    I'm committing the initial work to get 3.0.6 built.  Note that this will
    build, but one cassandane test will fail.  I'm tracking that down now
    but I may have to disable that test until the issue is understood.
    O# Please enter the commit message for your changes. Lines starting