Allow to override field label within field block

Patch in #14 Does not apply cleanly on 10.1

I don't understand change in #11 thus just re-rolling #2 for 10.1

The Needs Review Queue Bot → tested this issue.

While you are making the above changes, we recommend that you convert this patch to a merge request → . Merge requests are preferred over patches. Be sure to hide the old patch files as well. (Converting an issue to a merge request without other contributions to the issue will not receive credit.)

Converted the patch into MR.
Thanks!

Was previously tagged for tests and issue summary update which both are still needed.

When moving to review please take a look at the tags and any remaining tasks in issue summary (this case everything is empty)