HHH-7915 Include referenced columns when creating foreign keys from the included table
HHH-7915 test case and cleanup
HHH-8068 Suggestion for improvement.
HHH-8068 formatting and cleanup