qnd: falcon - entitlement general fixes 
qnd: falcon - entitlement general fixes 

git-svn-id: 8a2ccb88241e16c78017770bc38d91d6d5396a5a@83129 6b8eccd3-e8c5-4e7d-8186-e12b5326b719

ivesbai/server,ratliff/server,ratliff/server,gale320/server,jorgevbo/server,DBezemer/server,doubleshot/server,matsuu/server,ratliff/server,ivesbai/server,matsuu/server,gale320/server,ivesbai/server,kaltura/server,kaltura/server,ratliff/server,kaltura/server,gale320/server,kaltura/server,ivesbai/server,ratliff/server,DBezemer/server,doubleshot/server,matsuu/server,gale320/server,doubleshot/server,doubleshot/server,matsuu/server,ratliff/server,DBezemer/server,doubleshot/server,matsuu/server,jorgevbo/server,ivesbai/server,DBezemer/server,ivesbai/server,jorgevbo/server,DBezemer/server,gale320/server,jorgevbo/server,ivesbai/server,DBezemer/server,matsuu/server,doubleshot/server,matsuu/server,gale320/server,DBezemer/server,kaltura/server,doubleshot/server,gale320/server,jorgevbo/server,ratliff/server,jorgevbo/server,kaltura/server,jorgevbo/server,ratliff/server,ivesbai/server,doubleshot/server,jorgevbo/server,gale320/server,DBezemer/server,matsuu/server