Merge "Put composer 2.3 in the right cpuset." into qt-dev am: 862a9fdf6e
am: ccc1805cb5

Change-Id: I3970374a0f443b6c90b91e11bb02537e6c90b3e5