Set branch version
Adding logging to MetaDataEndpointImpl to narrow down intermittant issue
Adding more log messages
Clear mutations list before retry upon concurrent modification exception
Merge conflicts from 2.0.1 branch
Fix conflict in javadoc
Merge branch 'master' of github.com:forcedotcom/phoenix
Transferring over bug fix from 2.0.1 branch to master