Merge "Switch to using pbr version for cli version string"