Merge changes from topic "unify-qemu-machines" into integration

* changes:
  refactor(qemu): move options to start of file
  refactor(qemu): keep AArch64 cpu flags in one section