CONN-1033: Reverted WS framework classes to Direct RI 3.0.1 release