Fixed single entity return bug for pagination and wrote appropriate test
DS-1166.  Reverted surefire and checkstyle plugin versions (for Sonar).
Merge branch 'DS-1203'
Merge branch 'master' into ds-1229