Bug 1093759 - Use fast-forward when landing from integration branch
Merge bug_1093759_use_fast_forward into integration-master