more backporting

* PropertiesUtil not there, use OsgiUtil instead
* moved JMX whiteboard to the start of the inclusion list, so it is
  unpacked and started first
* made MBean instantiation more stable