NEW: added support for option "doNotCombineResult" on PDP
FIX: improved docstrings on PEP, __init__
Fix invalid information when doing proxy-info without CS

Revert "CHNAGE: in getCredentials() - failure to contact CS is not fatal"

This reverts commit 3b0886ee8dcf33023c899891643239f0f5bd7833.

(cherry picked from commit 579f4d480292e5d4b63c8a4f1eb0817a9733e85f)
Merge pull request #1485 from ubeda/v6r8_NEW_doNotCombineResult

[v6r8] NEW: added support for option "doNotCombineResult" on PDP
Merge pull request #1486 from acasajus/revert-invalidinfo

Fix invalid information when doing proxy-info without CS
v6r8p15
Conflicts resolved after merging with rel-v6r8
v6r9-pre2
Merge remote-tracking branch 'upstream/rel-v6r9' into rel-v6r9