Restore parent form's settings when subform ends
Merge branch 'fix_nested_subform_settings' into fork-develop

Conflicts:
	Twig/BootstrapFormExtension.php