Changed lock to be enabled from TOMCAT targets instead of old test logic.

This matches the original F14 logic