Merged refs/pull/2037/head from repository cms-sw
moving consumes declaration in the constructor