Downgraded the use of flat_map to map.flatten instead so that this works on 1.8.7
Downgraded the use of flat_map to map.flatten instead so that this works on 1.8.7

l8nite/stash-client,finn-no/stash-client