Boris Johnson says defence spending will rise to 2.5 of GDP, after cabinet row