DERBY-6410: ClassCastException when launching derby from windows subst drive Merged revision 1585407 from trunk and manually resolved conflicts.