changes for FLW incentives and CG
TW/OM | #0 | Relaxing the file permissions for merging flw-incentives. Needs to be undone
OM, TW | #0 | Resolving merge commits
Revert "TW/OM | #0 | Relaxing the file permissions for merging flw-incentives. Needs to be undone"

This reverts commit 3b0ac732121eab40db2d81c6fa423e91bb595850.
Merge branch 'master' into prod