Forward-port patches from SUSE, including move to database barclamp

I could only do some preliminary testing (getting a token worked), but submitting since others want this ASAP.