RFR (T) 8215034: Remove old HOTSWAP conditionals

[coleen . phillimore]

I was in the area and found these few remaining conditionals.

Tested with tier1 on Oracle platforms.

open webrev at http://cr.openjdk.java.net/~coleenp/8215034.01/webrev
bug link https://bugs.openjdk.java.net/browse/JDK-8215034

Thanks,
Coleen