Merge "Very final review before cutting the release Very-very final review :-) Update...
authorjonasbjurel <jonas.bjurel@ericsson.com>
Wed, 3 Jun 2015 22:20:54 +0000 (22:20 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 3 Jun 2015 22:20:54 +0000 (22:20 +0000)

Trivial merge