PR cleanup, refactor shared code
PR cleanup, refactor shared code

dimagi/commcare,dimagi/commcare,dimagi/commcare-core,dimagi/commcare-core,dimagi/commcare-core,dimagi/javarosa,dimagi/commcare,dimagi/javarosa,dimagi/javarosa