Fix pkg-devel self upgrade when remote repo defaults to non-devel

Issue:	#936