addressing brocks comments
fixing merge conflict -ve tests
adding mask pattern for location, removing unncessary changes to test files
reverting changes in some q.outs
fix authorization_addpartition
stats_noscan_2 fix