Improve CDS selectBars timing
Merge branch 'develop' into fb_membersets

Conflicts:
	test/src/org/labkey/test/util/CDSHelper.java