Merge "Check for NLS bind permission when rebinding services" into tm-dev