update to keep sync with the latest fabric8 V2