Update Entity API and Profile 2 modules #1877456