Lps 41260

1st commit: LPS-41073 Fix label since we're now using aui:input
2nd commit: LPS-41260 Add includeHiddenField to aui:input