Add missing import statements
add missing imports (pull request)

ws/1.6.x' into 1.6.x

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.