Fix: open locked file on windows during data_bag update
Fix merge conflicts from aseresun/master