Branch b1_6

b=12743

since we don't support diskfs blocksize != 4K right now, so change the test case to
make all the disk with 4K blocksize.