Merge remote-tracking branch 'origin/master' into ubuntu/14.04
Merge pull request #2709 from mvo5/new-packaging
debian: move the packaging out into package/$id-$version_id
add FIXME
Merge pull request #2688 from zyga/no-unkeyed-fields
overlord/stapstate: don't use unkeyed fields
Merge remote-tracking branch 'upstream/master' into new-packaging
fix 14.04 spread
sync latest changes
Merge pull request #2705 from mvo5/14.04-feature/clean-rules-14.04
14.04 part for feature/clean-rules-14.04 branch
fix 14.04 packaging dir generation
add "debian" symlink to 16.04 packaging to keep gbp working
Also needed for autopkgtests.