Fully lock "template-locked" fields

[will]

If field (or it's parent) has had template locked, users should still be able to fully lock this field. This is easy enough for the children of the template-locked field: Simply enable full locking. But, for the template-locked field itself, do you replace the template lock with a full lock (and lose the time-stamp and user who locked the template originally)?

[will]

Locking (and unlocking) of fields is allowed if an ancestor is template-locked, but not if an ancestor is fully-locked. r5396.

This feature is not fully finished (eg if a field is template-locked, you can only fully lock it by unlocking, then fully locking. This may not be "allowed" if locked by someone else, and it loses the "locking history".