bring danube branch up to date with master

bring danube branch up to date with master

Gerrit doesn't like merge commits

eg: this wont work

git merge origin/master --no-commit
git commit -sv
git review stable/danube

So I took the diff
git diff origin/stable/danube..master
and checked out the files that were changed
git checkout origin/master -- featureconfig.rst

normally you should checkout the change sets and resolve the
merge conflitcs, but in this case we dont care.

Change-Id: I2a02e8ae7237825911f22663a5c65cdb9f5c5e4f
Signed-off-by: agardner <agardner@linuxfoundation.org>