Updates to data_bags and ow_users
Merge remote-tracking branch 'origin/master'