Sync from the current master of jims

Change-Id: Ia24c1a194e5212f62dc72bae940a2ecc5cf1859d
Disable the Java serialisation warnings

Change-Id: I2db892fc90aba1c57a4e01879de9e641d2827b15