Rebase from 'upstream'
Added install rule for package.xml
remove automatic include_directories
fix the template for pkgconfig
make sure the docs build
one more pkgconfig fix
install opencv2.pc