Revert "Add master local ip mapping to minion id checking"

This reverts commit 1f890ea9592e6237b831306a4376a19dec8fb682 and fixes #13665. Please read the discussion in that bug report as I am, as of now, not entirely sure if this fix might introduce regressions.