968012 - Replaced grinder logging config with nectar logging config
924832 - check if node is already activated.
better variable.
Merge pull request #508 from pulp/jdob-968012

968012 - Replaced grinder logging config with nectar logging config
919179 - document how node strategies may be changed.
fix wording.
Addressed PR review comments.
Merge pull request #510 from pulp/jortel-924832

924832 - check if the node is already activated in commands
Merge pull request #513 from pulp/jortel-919179

919179 - Needs an option to update strategies
928413 - fix query used to determine of bind has pending actions.
Merge pull request #514 from pulp/jortel-928413

928413 - fix query used to determine of bind has pending actions.
927216  - remove reference to CDS in the server.conf security section.
Merge pull request #515 from pulp/jortel-927216

927216  - remove reference to CDS in the server.conf security section.
Merge branch 'pulp-2.2', pre-build.