The police should "get medieval" on troublemakers to avoid a repeat of the 2011 riots, Boris Johnson, the Mayor of London, has said as he backed plans for the first water cannon on the British mainland.