Merge branch 'release/release-1-21-2014_1_5_2'
Updated notes in BPFd-298 I was passing the uid of the file and not the current user
Merge branch 'hotfix/BPFD-298' into develop
Hotfix