Manually merge branch 'allyen-6.1.4-shibboleth' into 7.2.0