Bavarian deputy prime minister kept in office despite neo-Nazi past