Update and simplify jolokia_opts