Current 2.x branch was created from hawtio v1 master (and hawtio-java) a year ago (February 2016) and many issues have been fixed on master since then. Now is good time to merge those fixes into 2.x so that we can have the basis for future development and bug fixes for both 1.x and 2.x.