Fix nodeorder to affect only if the order has been set.
Fix comments.
Fix more comments.
Fix comments.
Merge branch 'SCHOLAR-3.x' into 5928-1
Merge pull request #5946 from openscholar/5928-1

Fix nodeorder to affect only if the order has been set.