[Merge] lp:~smoser/software-properties/shortcut-refactor into lp:software-properties

[Scott Moser]

Michael,
  the test case is fixed now, please do review. and accept or merge if you see fit.
  Thanks.

-- 
https://code.launchpad.net/~smoser/software-properties/shortcut-refactor/+merge/188500
Your team Ubuntu Core Development Team is requested to review the proposed merge of lp:~smoser/software-properties/shortcut-refactor into lp:software-properties.