Don't display snapshot string to everyone
add year-end bonus to total in BPR
Merge pull request #4151 from dimagi/opm-es

Misc opm fixes