Hardening/476 boost154 ubuntu

I tried to compile in an Ubuntu 14.04 environment and did not have the issues described in #476.

It may have to do with the update (maybe?) in 14.04.1. This PR is just undoing what was done.
This line shouldn't appear in the diff... Maybe you need to sync updating develop in local an merging develop into hardening/476_boost154_ubuntu