AUI-1545 - Form builder Checkbox and Radio have incorrect markup

https://issues.liferay.com/browse/AUI-1545
https://issues.liferay.com/browse/LPS-47388