[C++] Fix merge problem.
[C++] Fix merge problem.

Re-introduce muesli 0.1.2.

Change-Id: I07fa179d51923851bec5b83541a9094ff618575d

bmwcarit/joynr,bmwcarit/joynr,clive-jevons/joynr,bmwcarit/joynr,clive-jevons/joynr,clive-jevons/joynr,clive-jevons/joynr,bmwcarit/joynr,clive-jevons/joynr,bmwcarit/joynr,bmwcarit/joynr,bmwcarit/joynr,clive-jevons/joynr,bmwcarit/joynr,bmwcarit/joynr