Added lifetime/margintime keywords as alias for keylife/rekeymargin.