Merge "Omaha #3300 moving 15.1.1 deltascript back into 14.4.1" into omaha_14.4.1

Former-commit-id: 5c8e4250a3 [formerly b787ba53db] [formerly d410f5b2fd [formerly 8d25cc0eb9bc92d29fa2e4832b8fa974953a5609]]
Former-commit-id: d410f5b2fd
Former-commit-id: 1427299141
This commit is contained in:
Greg Armendariz 2014-07-16 15:26:25 -05:00 committed by Gerrit Code Review
commit 24cea675e7