add distinct pagination test
move comment to appropriate location
add multiple column count support for distinct pagination
fix spacing
Fix conflict.
Fix conflicts.
Merge branch '4.2'