Merge changes I97786b89,I38e8c5c9,Ia049f20f

* changes:
  cactus: select different stdout device at runtime
  pl011: allow alternate stdout to be used
  cactus: do not compile irrelevant test files