add BucketEntityManager.java and its tests class and a few changes in BucketModel.java version2

Change-Id: I201035d809d10e0b251a924236da4eb5e23f1133