Removing a use reference to user that was not used in the file
When compiling from a clean build I got a could not find the pallet.action.user reference.  Since the reference was not being used, I just removed it
Fixing a duplicate define issue for the lift function.
When compiling the code from scratch there was a duplicate define as the file was using lift from pallet.api and defining a lift function in there as well.  The solution used was to rename the pallet.api to be lift2
Merge branch 'upstream/local' into 519local/develop