Merged refs/pull/6410/head from repository cms-sw
Touch-ups from code review.