Removing obsolete command line option
Resolved merge conflict
Adding hpx::unmanaged.hpp(id)