Boris Johnson seeks to defuse row over abandoning defence spending pledge