Fixes #7003 - Revert LDAP to simple_tls
fixes #7061 - show file upload when template is not locked
Fixes 4642: Fix intermittent test failures on rundeck functional tests