Fixes: #2848 Duplicated code in setup_stepFinish
Fixes: #2838 Fixed div in acl-filter.tpl file