Merge changes I36e45c0a,I69c21293 into integration

* changes:
  plat/qemu: add "max" cpu support
  Add support for QEMU "max" CPU