This allows mix-n-match between blocks and repeatable things, allowing
entity fieldsets to be repeated, as well as arbitrary non-repeatable blocks.

Improve efficiency by not fetching layout if not needed in api.get
Fix test failure by correctly merging existing metadata during update