[#47961525] Error in createSite with sitehistory FK
[#47961633] Composite ids need hashcode & equals
Merge branch 'staging' into production