several changes to use local definitions and responses, and quick fixes

1 job from fixes-for-nslcm in 0 seconds (queued for 10 seconds)
Status Job ID Name Coverage
  External
failed jenkins

00:00:31