Sync Gateway: misc updates
CB Server: fixed MB-9168
Merge pull request #16 from amy-kurtzman/stage

Move Amy's changes to Stage