Fix clang with boost 1.46.1 and 1.47

Change-Id: I53b9fcb1bcf553ea128f7edb2d15bec87fd4f9e9
Merge release-5-0 into master

Change-Id: If41f9c458e5d3aa5f841afcd71bc7f72a1f312c7
Merge "Merge release-5-0 into master"