Mirror changes in optaplanner
[Shapes] Upgrade to Empire 0.8.4