Bug 957665: Add telemetry to measure how many people have OCSP enabled, r=keeler

--HG--
extra : rebase_source : e6dd0d7d06ce0eb5b2f34a77a851dd7c0655ac3e
Bug 958906: Remove reliance on implicit conversion from enum types to integers to fix VS2013 build bustage, r=bjacob

--HG--
extra : rebase_source : 2e197e5f74cf20eae6f9b1801056d0438e527696