PSR-4
Update child repos to PSR-4 for git subs-plit
Merge remote-tracking branch 'origin/psr-4'

* origin/psr-4:
  [tests] Add bootstrap back to not pollute prod-ish setups
  Update child repos to PSR-4 for git subs-plit
  PSR-4