2 15 merge

Merging in CommCare 2.15 QA changes to master