Updates for using trunk version including HELIX-216 fix for auto rebalancing

- tested with commit f2a64558914e96255873656242b3d0e76b2eb7b4