Branch for developing Bitten client/server testing


[SVN r41004]
Merge in some changes from trunk


[SVN r41340]