Japan PM names safe hands in Cabinet reshuffle but makes maverick top diplomat