Fix caption message placement based on the snippet code.

Comment From: pivotal-cla

@kusumo1920 Please sign the Contributor License Agreement!

Click here to manually synchronize the status of this Pull Request.

See the FAQ for frequently asked questions.

Comment From: pivotal-cla

@kusumo1920 Thank you for signing the Contributor License Agreement!

Comment From: bclozel

This PR should not try to merge a previous release commit, like dda5250b75c9a20636d04b9325254e25f960b7fb. Can you rebase your PR and only leave 861d9ff in?