Merge changes I20310606,Ic23b7fb2 into pi-dev

* changes:
  Camera: more external camera CTS fix
  Camera: various external camera CTS fixes