Merge "Reduce scrypt time in synthetic password flow" into oc-dev