Add two columns to EntityTypeDetails - AllowSelfLockingOverride, AllowOthersLockingOverride. BaseAbstractEditCommand can then be modified to look at these, and give the user other options on how to proceed if a lock is being held on an entity.
Moving to new milestone, all changes to this point have been tagged in trunk-2009-05-10-01.