Adding the UpcomingSprint keywords. The code is up for review but still being iterated on. We plan to implement it in the upcoming release.
As there is a workaround described at the bottom of https://access.redhat.com/solutions/5460671 for 4.6, its probably not necessary to backport this.
Closing this for 4.6. The fix is in 4.7. Please reopen if you think its necessary to be in 4.6.z.