[client]: Fixed classpath issue in the client
[client]: Fixed last fix.
Merge branch 'master' into new_romie