Subject: Small fixes for java-powermock

From: Gábor Boskovits <[email-masked]>
Date: Sat, 23 Jun 2018 17:31:25 +0200

Closing, already on master as 1124683d8cfddf7869c52ff2a4e4fb402a36ac88,
and 59e0021cc79b577daaf0f23a9f0b93e166400261. Thanks!