Restore autoexpand, but don't expand when merging
Restore autoexpand, but don't expand when merging

git-svn-id: 7c053b8fbd1fb5868f764c6f9536fc6a9bbe7da9@584209 13f79535-47bb-0310-9956-ffa450edef68

ra0077/jmeter,kyroskoh/jmeter,d0k1/jmeter,hemikak/jmeter,ra0077/jmeter,DoctorQ/jmeter,thomsonreuters/jmeter,ThiagoGarciaAlves/jmeter,irfanah/jmeter,vherilier/jmeter,ubikfsabbe/jmeter,fj11/jmeter,liwangbest/jmeter,max3163/jmeter,etnetera/jmeter,liwangbest/jmeter,vherilier/jmeter,kyroskoh/jmeter,hizhangqi/jmeter-1,kschroeder/jmeter,fj11/jmeter,kschroeder/jmeter,d0k1/jmeter,etnetera/jmeter,ubikloadpack/jmeter,tuanhq/jmeter,irfanah/jmeter,liwangbest/jmeter,tuanhq/jmeter,ubikloadpack/jmeter,ThiagoGarciaAlves/jmeter,max3163/jmeter,etnetera/jmeter,max3163/jmeter,vherilier/jmeter,ubikfsabbe/jmeter,ThiagoGarciaAlves/jmeter,max3163/jmeter,vherilier/jmeter,etnetera/jmeter,DoctorQ/jmeter,tuanhq/jmeter,thomsonreuters/jmeter,d0k1/jmeter,ubikfsabbe/jmeter,etnetera/jmeter,d0k1/jmeter,kyroskoh/jmeter,hizhangqi/jmeter-1,ra0077/jmeter,hemikak/jmeter,hemikak/jmeter,ra0077/jmeter,fj11/jmeter,ubikloadpack/jmeter,thomsonreuters/jmeter,hemikak/jmeter,ubikfsabbe/jmeter,DoctorQ/jmeter,irfanah/jmeter,kschroeder/jmeter,ubikloadpack/jmeter,hizhangqi/jmeter-1