Removed unused Boost.MPL and Boost.Iterator includes.
Merge branch 'develop'