yocto 1.7 final rebase

[Alexander Larsson <alexl redhat com>]

I just rebased gnome-continuous-yocto to the latest upstream, which is
now tagged with yocto-1.7, so i guess its released:
https://github.com/alexlarsson/gnome-continuous-yocto/tree/gnomeostree-3.14-dizzy-rebased

I've not yet built it, but it was a trivial merge and not a lot changed.

How do we merge this? Do we use a new branch, or do we force replace the
old one? I didn't want to git merge the changes because then it would be
harder to eventually rebase our changes on the next yocto release.