remove redundant tables needed for test dependencies
create private func key template when creating a user
Merge branch '4903_create_template'