merging 673238c...Simplify course URL discovery util.
merging 673238c...Simplify course URL discovery util.

edx-solutions/edx-platform,edx-solutions/edx-platform,edx-solutions/edx-platform,edx-solutions/edx-platform