Applied changes from ed0b2f88855 to master

* Updated dependencies
* Updated VOMS handling
* Fixed integration with rOCCI 2.5.16