Fix changelog and version after merge with public master

3 jobs for 2017.03 in 3 minutes and 54 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Static Test
passed #1586
SonarQube

00:02:00

passed #1585
lint

00:01:03

 
  Integration Test
passed #1587
api-test

00:01:53