Preparation for gofer 2.0 in f21+
Merge pull request #1381 from jortel/gofer-lt-2.0

Preparation for gofer 2.0 in f21 and beyond.
Merge branch '2.4-release' into 2.4-testing
Merge branch '2.4-testing' into 2.5-testing