BZ-13237:Error when downloading EBP
Merge branch 'RC20140807' into integration