Follow-on refinements to Docker Security Scan job (#5438)