France's ruling parties agree to 'total rewrite' of controversial 'Article 24' security measure