Mapping rules syntax, test updated
Merge remote-tracking branch 'origin/development' into development
changing execution phase of packaging ant script