Changes related to build script, also squased recent commits

It should be opposite. We've 7.x-1.0-alpha1 and the project for all files should be the same, as ads_features to handle the updates.