combine ElasticPillow with AliasedElasticPillow
combine ElasticPillow with AliasedElasticPillow

nothing else was extending it and it was confusing that they were both
present.

dimagi/commcare-hq,qedsoftware/commcare-hq,dimagi/commcare-hq,qedsoftware/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq,qedsoftware/commcare-hq,dimagi/commcare-hq,qedsoftware/commcare-hq,qedsoftware/commcare-hq