fix namespace conflict for issue.remaining_hours and common_helper remaining_hours. re #830
Merge branch 'bug/830-upgrade'