[#4060] Sync with SFX.
[#4060] Sync with SFX.

Signed-off-by: Kyle Adams <3c25b01657254677d3e1a8fd1f0742c5d489bd39@geek.net>

Bitergia/allura,apache/allura,apache/allura,Bitergia/allura,heiths/allura,lym/allura-git,Bitergia/allura,lym/allura-git,lym/allura-git,apache/incubator-allura,apache/allura,heiths/allura,apache/incubator-allura,apache/incubator-allura,apache/allura,lym/allura-git,apache/incubator-allura,Bitergia/allura,heiths/allura,heiths/allura,apache/allura,heiths/allura,lym/allura-git,Bitergia/allura