Feature #1565: Add new ACL resource ID bit, '%', for clusters. The reserve lookup is pending
Feature #1565: Add new resource ID bit % in ruby OCA
Feature #1565: Implement reverse search for ACLs that apply to objects in a cluster
Feature #1565: Add new cid columns in onedb migrator
Feature #1565: Add new cid columns to fsck
Feature #1565: Add acl % cluster bit to Java OCA
Feature #1681: Add new oned.conf att. for a default umask
Feature #1681: Read User template's UMASK attribute to create new objects
Feature #1681: Add command oneuser umask
feature #1681: Conversions from string to mask (binary) are made in User::get_umask
Merge branch 'feature-1681'
feature #1565: Check resource types for CLUSTER based ACLs
Merge branch 'master' of git.opennebula.org:one
Merge branch 'feature-1565'

Conflicts:
	src/pool/PoolObjectSQL.cc