The Scottish housing minister said the current rent control regime would end next month