Nalexander/bug 1021055 clients device type

@rnewman: there's a test here that's new.  You looked at the code in the ticket already.