Rename form_*_layout templates extension from ".tpl" to ".smarty"
Merge remote-tracking branch 'upstream/form-extension' into form-extension