MFC of 252527:

Make better use of metadata area by avoiding using it for data blocks
that no should no longer immediately follow their indirect blocks.

Reviewed by: Bruce Evans
Approved by: re (marius@)