[Moose-dev] Merging MooseEntity and MooseElement