KRACOEUS-7279:fixed broken test
KRACOEUS-7279:fixed broken test for real
Merge pull request #263 from jwillia/KRACOUES-7279FIX

KRACOEUS-7279:fixed broken test
KRACOEUS-6955 : common budget core mainly and other miscs
KRACOEUS-6955 : common #258 fix upon comments
KRACOEUS-6955 : common #258 fix upon comments 2
 KRACOEUS-6955 : common #258 fix upon comments 3
KRACOEUS-6955 : common #258 fix upon comments 4
Merge pull request #258 from yyuan1/0528_common

KRACOEUS-6955 : common budget core mainly and other miscs