Merge "Remove x509 neutron duplication"