What is the Japanese warrior gentry or middle class, formerly called samurai; also, any member of this class called?

shizoku — The Japanese warrior gentry or middle class, formerly called samurai; also, any member of this class. (Webster's 1913.)