Considered some corner cases in MegaRaid BBU check.
Cosmetics
Merge branch 'develop'
Merge branch 'master' into develop