osmo-config-merge expects only one space indentation for each level and
the VTY also outputs the config formatted like that.
Change-Id: I9c7a5bc6b3eae955288dada80abc856779ca9336
For OpenBSC it made sense to have a /tmp/bsc_mncc file to share for
external MNCC, but now that we have an MSC osmo-sip-connector
communicates with that, so rename the socket file to avoid confusion.
Change-Id: I5e0dbf1aafe1b9c3776c49a08a76d64dd4fe9cc5