Merge "Remove AD-SAL dependencies from Neutron service"