* commit 'b90db3e6ab1bc89752ce8d7bd286268c41843693': Remove references to non-std Java classes. [DO NOT MERGE]