This is a squash of the following cherry-picked commits from master that correct some issues with the elpa.spec file: 5c548fe6 8285d13b b483df9b 722ef865 6e973ae5 1acbcf5d
