KNOX-280: Extend test timeout for deployment to hopefully address CentOS 5 test failure.
KNOX-290 - Upgrade Shiro dependency to 1.2.3
KNOX-289: Remove incubting/incubator from source and build.
BUG-14343: Resolve apache auto merge baikal knox conflicts.