[boost] [gil] Can I merge two minor fixes to header dependencies and tests for 1.7.4?