Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev