Merge "Do RPM dep tests in snapshot build, minor cleanup"