Merged in CommCare 2.15 QA Changes