Updates SOL006 branch with master, and configures osmclient for SOL006