Closes #384
closes #385
I think this is all we need, to Closes #386
Closes #387 Seems to mostly deal with admin and list templates
s/indef/undef/
Merge branch 'bugfixes-6_4_4' into installer_additional_options