In 1924, the Tajik Autonomous Soviet Socialist Republic was created as a part of Uzbekistan, but in 1929 the Tajik Soviet Socialist Republic (Tajik SSR) was made a separate constituent republic, however the predominantly ethnic Tajik cities of Samarkand and Bukhara remained in the Uzbek SSR. Between 1917 and what year did collectivization of agriculture occur?