Merge "package-modules: use && instead of ; between copy commands"