Merge 2017-patches in master

This is including the following MRs: !420 (merged) !421 (merged) !415 (merged) !417 (merged) !396 (merged) !408 (merged) !414 (merged) !412 (merged) !411 (merged) !403 (merged) !404 (merged) !406 (merged) !402 (merged)

git log origin/master...origin/prod-to-master | grep "See merge request" | grep -o "\![0-9]*" | paste -sd " " -