Bring back extra-cmake-modules

We need git snapshot of ECM to build KF5 nightly
Merge branch 'master' into nightly