Merge "Package jsonevent-layout with war"