Dev master

Pull Changes from dev-master back to master - these include fixes to support connecting from a remote console for JMX