KFSTP-1571: more fixes to hopefully satisfy the rice data upgrade job
Merge pull request #58 from smith750/KFSTP-1571

KFSTP-1571