Merge branch 'kbase'
Merge branch 'ff'
missed a couple places where with hardcoded rabbitmq host or unspecified port
minor, indent
move job lock to before data download; remove job from list whether it is completed or terminated