Merge "Bug 552000 - [releng] Move to EPLV2"