Merge pull request #2 from zkang/master

Add always re-apply job config option
CAAT-2607 fix build option not available
CAAT-2607 only re-apply config when necessary
Merge pull request #3 from zkang/fixbuildoption

CAAT-2607 Fix build option