Add fieldset and legend to blocks behatnotneeded Change-Id: Iae4266b5261dbaef05586aca30c494580c1b991c