Merge pull request #961 from claco/v4.2.3rc

Move cinder scheduler to where volume is located
Update submodule