Changed to use the common code version of ExpandCollapseButton, which was moved to SUN from this repo.  See issue 22 in Sun.