VIVO-552 updates for vivo:Contract
fixed template issue
Merge branch 'maint-rel-1.6' into develop