Merge branch 'fix/pe-specific-fixes' into 'develop'

Remove ISIS multicast section

See merge request !193

geant/gap_ansible/roles/bc_templates/routers/nokia/router/isis.j2

@@ -12,12 +12,6 @@
     <system-id>{{ iso_system_id }}</system-id>
     <traffic-engineering>true</traffic-engineering>
     <area-address>{{ geant_iso_area_id }}</area-address>
-  {% if router_role == 'pe' %}
-    <multicast-import>
-        <ipv4>true</ipv4>
-        <ipv6>true</ipv6>
-    </multicast-import>
-  {% endif %}
     <overload-on-boot>
         <timeout>300</timeout>
     </overload-on-boot>

geant/gap_ansible/roles/bc_templates/routers/nokia/router/p_to_pe_router_base.j2

@@ -9,6 +9,5 @@
             {% include 'router/flowspec.j2' %}
             {% include 'router/ldp.j2' %}
             {% include 'router/rpki.j2' %}
-            {% include 'router/isis.j2' %}
        </router>