.gitignore: update and resolve merge conflict;
Merged
port igtf-certificates: some cleanup;
move symbolic link in ${prefix}/share/ from port globus-clients to igtf-certificates;