Applying auto format changes
Foreign key constraint violation when altering privilege.privilege column - TRUNK-3993
Merge branch 'working'