Merge "Just realized that these should NOT be PCF'd. If a server or client were using...
authorErich Keane <erich.keane@intel.com>
Wed, 10 Sep 2014 16:35:04 +0000 (09:35 -0700)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Wed, 10 Sep 2014 16:35:04 +0000 (09:35 -0700)

Trivial merge