PLFM-2039 - Remove the join of the node table from the can-access query
Merge the 3 methods that reference the ACL DAO into one
[PATCH] PLFM-2018: add message fields to Evaluation object
Merge pull request #558 from bkng/release-4

[PATCH] PLFM-2018: add message fields to Evaluation object
Merge pull request #556 from eric-wu/release-4-20130716

PLFM-2039, PLFM-2040 ACL Refactoring
Merge 'upstream/release-4' into 'develop'
Merge pull request #559 from eric-wu/quickfix

Merge 'upstream/release-4' into 'develop'