Merge master onto 2.0.x for beta2 release#150

wangjoshuah merged 2 commits into2.0.xoptimizely/java-sdk:2.0.xfrom

masteroptimizely/java-sdk:masterCopy head branch name to clipboard