switch corehq branch to s2 with new_casedetails merged in