CDB-1561 Ordering by column DESC will show nulls at bottom
Fix User model specs, add to Makefile
Merge remote-tracking branch 'origin/CDB-1561' into release/2.10.0

Conflicts:
	Makefile