create trunk from version 2.21alpha_060917