Bug fix with overlay, now includes all the war files required.
(cherry picked from commit c83b1c4)