Merge "Remove jolokia dependency from config-subsystem."