Merge from htcondor repo master & lark plugin infrastructure related commits

The latest commit includes the changes out of condor_contrib folder for lark related plugin infrastructure stuff