cherry-picking over changes to cmake for correct conf file installation
bumping revno and changelog