Added loyalty program redemption many-to-one relationship
Closes Issue #1828
More refactoring for Issue #1828
Closes #1821