core-4936 add skip rows and refactor code.
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/de-webapp