Make lease times configurable in for locker
Merge branch 'master' into init_args_to_from_struct