Merge branch 'Neon/release' into Neon/stable

Authored by jriddell on Feb 8 2018, 2:13 PM.

Description

Merge branch 'Neon/release' into Neon/stable

Merged Changes

CommitAuthorDetailsCommitted
b4c3367fb04ajriddell
Merge branch 'Neon/release-lts' into Neon/release 
Feb 8 2018
458cf891af1fjriddell
un setcap to fix running plasma 
Feb 8 2018