[master,distributed] added FileUserParameter and made some code cleanup