on second thought the app manager PR https://github.com/dimagi/commcare-hq/pull/244 is sufficiently intertwined with this PR. I'll make the change