Repoman fixes and minor adjustments
Fixed SRC_URI
Masked istatd