Allow rally-core to rebase changes in rally

Change-Id: I4baf4078c3c823091c7da63a04a1e68a78fd24ff
Merge "Allow rally-core to rebase changes in rally"