contrib/solaris-smf: information on how to integrate with Solaris SMF
Added an option for configure '--with-piddir=>directory>'. When not specified it is the same as 'WORKDIR'.
This came up when building the debian package. We need to change the location of the pid files.  For testing we can override it with
an environment variable 'CFENGINE_TEST_OVERRIDE_PIDDIR' and also defined 'sys.piddir', eg:

body common control
{
bundlesequence => { test };
}

bundle agent test
{
reports:
        any::
            "$(sys.workdir)";
            "$(sys.piddir)";
}
Merge pull request #1007 from tzz/tzz/bahamat/feature-contrib-solaris-smf

contrib/solaris-smf: information on how to integrate with Solaris SMF
Merge pull request #1009 from basvandervlies/pidir.configurable

Added an option for configure '--with-piddir=>directory>'.
Fix stack corruption when calling VerifyEnvironmentsPromise().
Merge pull request #1012 from kacfengine/master

Fix stack corruption when calling VerifyEnvironmentsPromise().
Fix compile error when not using libvirt.
Merge pull request #1014 from kacfengine/master

Fix compile error when not using libvirt.
Add some high-level bullets to change log for 3.6
Add user promise type
Rename 'container' -> 'data'
Clean up work/log/pid dir implementations and fix Windows build.
Merge pull request #1018 from kacfengine/master

Clean up work/log/pid dir implementations and fix Windows build.
Fix misspelling of daemon
Fix misspelling of Commercial in 607 places
Fix misspelling of available in libutils/man.c