JPA-51 - Incorporate revisions for @ForeignKey changes