Merge change I8404ae5f into eclair

* changes:
  Move some scripts that were in development/tools/scripts back in this project