Issue #2395337 by Berdir: Fixed incorrect "entity" dependendy keys.
Merge branch '8.x-1.x' into 2349435-seperate-processors-by-stage