Tons of code optimizations
Merge branch 'master' of https://github.com/aleibovici/com.nutanix.prism.git
Local classpath modified