Mitaka/dev

This update the multinode scenario for Mitaka. Note that I merged master prior to this to get the java version fix. This shouldn't cause any trouble when we'll merge this into master later.