Cap of 2% rise per annum will apply to existing tenancies but landlords will be able to charge more between tenancies