fix import issues, prepare pod spec for 2.0.0 RC1.