For NIHVIVO-3344, The name and ids of the auto complete fields were incorrectly set and the existing value was not being passed back to them either. I updated the macro and the freemarker templates that used the macro.

Also allowing label for "years of participation" to be changed according to value of drop-down in role forms.

productMods/templates/freemarker/lib/lib-vivo-form.ftl

@@ -15,14 +15,14 @@
 </#macro>
 
 <#-- After selecting an individual via autocomplete, display highlighted and with verify link -->
-<#macro acSelection urlsBase>
+<#macro acSelection urlsBase inputName inputId inputValue>
 <div class="acSelection">
     <p class="inline">
         <label></label>
         <span class="acSelectionInfo"></span>
         <a href="${urlsBase}/individual?uri=" class="verifyMatch">(Verify this match)</a>
         </p>
-        <input class="acUriReceiver" type="hidden" id="org" name="org" value="" />
+        <input class="acUriReceiver" type="hidden" id="${inputId}" name="${inputName}" value="${inputValue}" />
         <!-- Field value populated by JavaScript -->
 </div>
 </#macro>