Corrected setting of cookieSecure based on protocol
Merge branch 'ngsmrk-master' into feature/no-js-tracker