Fixed issue #1694868 by matglas86, ckrina, mogtofu33: Block only uses defaults from Display type Toolbox.

Now allows the configuration of block display with the same settings form as the fields.
Merge branch '7.x-4.x' into feature/block_settings