Updated defaults on block edit form to read from storage.
Version bumped from 7.x-2.2-rc20 to 7.x-2.2-rc21
Merge branch 'release-7.x-2.2-rc21'