Increment service number for APT plug-ins.  Also, merge pluggable.tests updates from HEAD.  No product code change.
15 files changed