UK, France stick to Calais migrant deal ‘now and when’ Britain leaves EU