build with 2.15 Update tests to account for more events appearing due to notedb being enabled. Also, since 2.15 removes drafts, remove the corresponding test case and include wip and private ones. Change-Id: I600b8a498f4b8b65db0694c4e98506a484e6db6d