1001609-more-fkey - more clean up prior to creatingforeign keys
Merge pull request #2941 from thomasmckay/1001609-more-fkey

1001609-more-fkey - more clean up prior to creatingforeign keys