Update cmake 2#285

Open

rpavlik wants to merge 2 commits intomasterfrom

Commits on Jan 6, 2017

Update CMake scripts, adding some from the shared repo that replace local ones or will be useful.
rpavlik
committed
Use the now "upstreamed" (to cmake-modules project) StashMapConfig
rpavlik
committed