Bug 855792 - CE requirement on maximum volume

fixed conflict in v1.0.1