Merge pull request #5196 from pks-t/pks/config-include-onbranch config: implement "onbranch" conditional